mirror of https://github.com/zulip/zulip.git
Rename humbug puppet module to zulip.
(imported from commit 7ed2a40439a48f4ef47932b345b9fac1a76cbb58)
This commit is contained in:
parent
a8c70f6dde
commit
7232369619
|
@ -21,7 +21,7 @@ if ! [ -e "$amazon_key_file" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
server_private_key_file=$humbug_root/servers/puppet/modules/humbug/files/id_rsa
|
||||
server_private_key_file=$humbug_root/servers/puppet/modules/zulip/files/id_rsa
|
||||
if ! [ -e "$server_private_key_file" ]; then
|
||||
echo "You need a server ssh key at $server_private_key_file"
|
||||
exit 1
|
||||
|
@ -78,10 +78,10 @@ git checkout master
|
|||
EOF
|
||||
|
||||
ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lroot <<EOF
|
||||
cp -a /root/humbug/servers/puppet/modules/humbug/files/puppet.conf /etc/puppet/
|
||||
cp -a /root/humbug/servers/puppet/modules/zulip/files/puppet.conf /etc/puppet/
|
||||
|
||||
userdel admin
|
||||
puppet apply -e 'class {"humbug": machinetype => "$type"}'
|
||||
puppet apply -e 'class {"zulip": machinetype => "$type"}'
|
||||
cp -a /root/humbug /home/humbug/humbug
|
||||
chown -R humbug:humbug /home/humbug/humbug
|
||||
# These server restarting bits should be moveable into puppet-land, ideally
|
||||
|
|
|
@ -27,7 +27,7 @@ stdout_logfile=/var/log/humbug/carbon-aggregator.log ; stdout log path,
|
|||
directory=/home/humbug/
|
||||
|
||||
[program:humbug-statsd]
|
||||
command=node stats.js /home/humbug/humbug/servers/puppet/modules/humbug/files/statsd/local.js
|
||||
command=node stats.js /home/humbug/humbug/servers/puppet/modules/zulip/files/statsd/local.js
|
||||
priority=200 ; the relative start priority (default 999)
|
||||
autostart=true ; start at supervisord start (default: true)
|
||||
autorestart=true ; whether/when to restart (default: unexpected)
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
@ -1,4 +1,4 @@
|
|||
class humbug::apache {
|
||||
class zulip::apache {
|
||||
$apache_packages = [ "apache2", "libapache2-mod-wsgi", ]
|
||||
package { $apache_packages: ensure => "installed" }
|
||||
|
||||
|
@ -21,7 +21,7 @@ class humbug::apache {
|
|||
owner => "www-data",
|
||||
group => "www-data",
|
||||
mode => 600,
|
||||
source => "puppet:///modules/humbug/apache/users",
|
||||
source => "puppet:///modules/zulip/apache/users",
|
||||
}
|
||||
|
||||
file { "/etc/apache2/certs/":
|
||||
|
@ -56,7 +56,7 @@ class humbug::apache {
|
|||
owner => "root",
|
||||
group => "root",
|
||||
mode => 640,
|
||||
source => "puppet:///modules/humbug/apache/ports.conf",
|
||||
source => "puppet:///modules/zulip/apache/ports.conf",
|
||||
}
|
||||
|
||||
file { "/etc/apache2/sites-available/":
|
||||
|
@ -65,7 +65,7 @@ class humbug::apache {
|
|||
owner => "root",
|
||||
group => "root",
|
||||
mode => 640,
|
||||
source => "puppet:///modules/humbug/apache/sites/",
|
||||
source => "puppet:///modules/zulip/apache/sites/",
|
||||
}
|
||||
|
||||
apache2site { 'humbug-default':
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue