paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[manual] Rename /root/humbug to /root/zulip.

Browse Source 
(imported from commit be64a226cfb90c2ec2e8f4f17ae0218643573535)
This commit is contained in:
Tim Abbott
2013-10-04 13:14:13 -04:00
committed by Steve Howell
parent 9677ce8920
commit b76bbc4982
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
servers/install-server
View File

@@ -70,21 +70,21 @@ chmod 600 /root/.ssh/id_rsa
cat > /root/.ssh/known_hosts <<EOF2
git.zulip.net ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDjW3wKDRuah6XT5a7Xta+S2d5ew1ZPxWTbKKgp6Cun111zFw1bvLGSKS0W3HnbXOyXLbVVsAH/cSNFHMvH2nitM15zp7w2w3NV8YbLZCkdFXp5KeKHuBQ+DYL+nDCKjunlrDfxDXvD7jn/wMN995ZsnEJqnc7N8uzIgt+5lbmie5jz3Xbt/7gQdjG5E0xGL7DzzJPp8kBzfE6B1qr5pWLVKXMuGXLCcbMaco5kEjRuM8dPrtG3kGG2YsjOkoHIqwtRwztXEmjklt1FFI06JYsW43PjmdP586nOg7n28k1ibhlF968PmRRX7USI7jJ+awPd/XH4neCdNG2f8JL2kRD
EOF2
# clone humbug repository
# clone zulip repository
cd /root
rm -rf /root/humbug
git clone git@git.zulip.net:eng/zulip.git humbug
cd /root/humbug
rm -rf /root/zulip
git clone git@git.zulip.net:eng/zulip.git
cd /root/zulip
git checkout master
EOF
ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lroot <<EOF
cp -a /root/humbug/servers/puppet/modules/zulip/files/puppet.conf /etc/puppet/
cp -a /root/zulip/servers/puppet/modules/zulip/files/puppet.conf /etc/puppet/
userdel admin
passwd -d root
puppet apply -e 'class {"zulip": machinetype => "$type"}'
cp -a /root/humbug /home/humbug/zulip
cp -a /root/zulip /home/humbug/zulip
chown -R humbug:humbug /home/humbug/zulip
# These server restarting bits should be moveable into puppet-land, ideally
apt-get -y upgrade

2
servers/puppet/modules/zulip/files/puppet.conf
View File

@@ -10,7 +10,7 @@
templatedir=$confdir/templates
prerun_command=/etc/puppet/etckeeper-commit-pre
postrun_command=/etc/puppet/etckeeper-commit-post
modulepath = /root/humbug/servers/puppet/modules:/etc/puppet/modules:/usr/share/puppet/modules
modulepath = /root/zulip/servers/puppet/modules:/etc/puppet/modules:/usr/share/puppet/modules
[master]
environment = production

4
servers/puppet/modules/zulip/manifests/apache.pp
View File

@@ -38,7 +38,7 @@ class zulip::apache {
owner => "root",
group => "root",
mode => 640,
source => "/root/humbug/certs/humbug-self-signed.crt",
source => "/root/zulip/certs/humbug-self-signed.crt",
}
file { "/etc/apache2/certs/humbug-self-signed.key":
@@ -47,7 +47,7 @@ class zulip::apache {
owner => "root",
group => "root",
mode => 600,
source => "/root/humbug/certs/humbug-self-signed.key",
source => "/root/zulip/certs/humbug-self-signed.key",
}
file { "/etc/apache2/ports.conf":

4
servers/puppet/modules/zulip/manifests/nagios.pp
View File

@@ -40,14 +40,14 @@ class zulip::nagios {
mode => 644,
owner => "root",
group => "root",
source => '/root/humbug/api/integrations/nagios/zulip_nagios.cfg',
source => '/root/zulip/api/integrations/nagios/zulip_nagios.cfg',
}
file { '/etc/nagios3/zuliprc':
ensure => file,
mode => 644,
owner => "root",
group => "root",
source => '/root/humbug/bots/zuliprc.nagios',
source => '/root/zulip/bots/zuliprc.nagios',
}
exec { "fix_nagios_permissions":

2
servers/puppet/modules/zulip/manifests/stats.pp
View File

@@ -32,7 +32,7 @@ class zulip::stats {
owner => "root",
group => "root",
mode => 640,
source => "/root/humbug/certs/stats1.zulip.net.crt",
source => "/root/zulip/certs/stats1.zulip.net.crt",
}
file { "/opt/graphite/conf/carbon.conf":