Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[manual] puppet: Rename humbug user to zulip. 

(imported from commit 90e517a4a657d2821b371c833e557c2003c9340c)
This commit is contained in:
Tim Abbott 2013-10-04 14:23:48 -04:00 committed by Steve Howell
parent 3d89ee20f7
commit f3fd1a2c44
28 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bots/zmirror_private.conf.template
View File

@ -5,7 +5,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/%(program_name)s.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/%(program_name)s.log ; stdout log path, NONE for none; default AUTO
environment=HOME="/home/zulip",USER="humbug",KRB5CCNAME="/home/zulip/ccache/%(program_name)s" environment=HOME="/home/zulip",USER="zulip",KRB5CCNAME="/home/zulip/ccache/%(program_name)s"

6
servers/install-server
View File

@ -85,7 +85,7 @@ userdel admin
passwd -d root passwd -d root
puppet apply -e 'class {"zulip": machinetype => "$type"}' puppet apply -e 'class {"zulip": machinetype => "$type"}'
cp -a /root/zulip /home/zulip/zulip cp -a /root/zulip /home/zulip/zulip
chown -R humbug:humbug /home/zulip/zulip chown -R zulip:zulip /home/zulip/zulip
# These server restarting bits should be moveable into puppet-land, ideally # These server restarting bits should be moveable into puppet-land, ideally
apt-get -y upgrade apt-get -y upgrade
if [ -e "/etc/init.d/nginx" ]; then if [ -e "/etc/init.d/nginx" ]; then
@ -98,8 +98,8 @@ fi
EOF EOF
# TODO: Don't give servers push access to our git! # TODO: Don't give servers push access to our git!
scp $SSH_OPTS -i "$amazon_key_file" "$server_private_key_file" humbug@"$server":/home/zulip/.ssh/id_rsa scp $SSH_OPTS -i "$amazon_key_file" "$server_private_key_file" zulip@"$server":/home/zulip/.ssh/id_rsa
ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lhumbug <<EOF ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lzulip <<EOF
chmod 600 /home/zulip/.ssh/id_rsa chmod 600 /home/zulip/.ssh/id_rsa
EOF EOF

2
servers/puppet/modules/zulip/files/cron.d/clearsessions
View File

@ -1,4 +1,4 @@
MAILTO=root MAILTO=root
# Clear all expired Django sessions at 10:22 PM every day. # Clear all expired Django sessions at 10:22 PM every day.
22 22 * * * humbug cd /home/zulip/deployments/current && python manage.py clearsessions 22 22 * * * zulip cd /home/zulip/deployments/current && python manage.py clearsessions

2
servers/puppet/modules/zulip/files/cron.d/email-mirror
View File

@ -1,3 +1,3 @@
MAILTO=root MAILTO=root
* * * * * humbug cd /home/zulip/deployments/current && python manage.py email-mirror * * * * * zulip cd /home/zulip/deployments/current && python manage.py email-mirror

2
servers/puppet/modules/zulip/files/cron.d/graphite_backup
View File

@ -1,4 +1,4 @@
MAILTO=root MAILTO=root
SHELL=/bin/bash SHELL=/bin/bash
0 3 * * * humbug /home/zulip/zulip/servers/puppet/modules/zulip/files/graphite/daily_rsync_backup.sh 0 3 * * * zulip /home/zulip/zulip/servers/puppet/modules/zulip/files/graphite/daily_rsync_backup.sh

2
servers/puppet/modules/zulip/files/cron.d/test_zephyr_personal_mirrors
View File

@ -1,4 +1,4 @@
# We don't actually need a valid Kerberos cache since these are sent # We don't actually need a valid Kerberos cache since these are sent
# unauth anyway -- but a cache is required for zwrite to run. # unauth anyway -- but a cache is required for zwrite to run.
* * * * * humbug env KRB5CCNAME=/home/zulip/ccache/zmirror-tabbott zwrite -c zulip-mirror-nagios -i nagios-test -m test -Szulip-nagios@mit.edu -d -q >/dev/null 2>/dev/null * * * * * zulip env KRB5CCNAME=/home/zulip/ccache/zmirror-tabbott zwrite -c zulip-mirror-nagios -i nagios-test -m test -Szulip-nagios@mit.edu -d -q >/dev/null 2>/dev/null

4
servers/puppet/modules/zulip/files/cron.d/zephyr-mirror
View File

@ -22,5 +22,5 @@ SHELL=/bin/bash
# For more information see the manual pages of crontab(5) and cron(8) # For more information see the manual pages of crontab(5) and cron(8)
# #
# m h dom mon dow command # m h dom mon dow command
35 * * * * humbug /home/zulip/zulip/bots/zmirror-renew-kerberos 35 * * * * zulip /home/zulip/zulip/bots/zmirror-renew-kerberos
*/2 * * * * humbug /home/zulip/zulip/bots/check-mirroring --sharded &> /var/lib/nagios_state/check-mirroring-results-tmp; mv /var/lib/nagios_state/check-mirroring-results-tmp /var/lib/nagios_state/check-mirroring-results */2 * * * * zulip /home/zulip/zulip/bots/check-mirroring --sharded &> /var/lib/nagios_state/check-mirroring-results-tmp; mv /var/lib/nagios_state/check-mirroring-results-tmp /var/lib/nagios_state/check-mirroring-results

8
servers/puppet/modules/zulip/files/munin/plugin-conf.d/munin-node.conf
View File

@ -119,8 +119,8 @@ env.PGUSER postgres
env.PGPORT 5432 env.PGPORT 5432
[humbug_send_receive] [humbug_send_receive]
user humbug user zulip
group humbug group zulip
[rabbitmq_messages] [rabbitmq_messages]
env.queue_warn 50 env.queue_warn 50
@ -138,5 +138,5 @@ env.queue_crit 40000000
user root user root
[tornado_event_queues] [tornado_event_queues]
user humbug user zulip
group humbug group zulip

22
servers/puppet/modules/zulip/files/nagios3/commands.cfg
View File

@ -68,7 +68,7 @@ define command{
define command{ define command{
command_name check_user_zephyr_mirror_liveness command_name check_user_zephyr_mirror_liveness
command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_user_zephyr_mirror_liveness' command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_user_zephyr_mirror_liveness'
} }
define command{ define command{
@ -83,37 +83,37 @@ define command{
define command{ define command{
command_name check_feedback_bot command_name check_feedback_bot
command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "python /home/zulip/zulip/bots/feedback-bot"' command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u zulip -c 1:1 -a "python /home/zulip/zulip/bots/feedback-bot"'
} }
define command{ define command{
command_name check_send_receive_time command_name check_send_receive_time
command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_send_receive_time --nagios --site=https://$HOSTADDRESS$' command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_send_receive_time --nagios --site=https://$HOSTADDRESS$'
} }
define command{ define command{
command_name check_postgres command_name check_postgres
command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_postgres.pl --dbname=humbug --dbuser=humbug --action $ARG2$' command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_postgres.pl --dbname=humbug --dbuser=humbug --action $ARG2$'
} }
define command{ define command{
command_name check_postgres_alert_args command_name check_postgres_alert_args
command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_postgres.pl --dbname=humbug --dbuser=humbug --action $ARG2$ --warning="$ARG3$" --critical="$ARG4$"' command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_postgres.pl --dbname=humbug --dbuser=humbug --action $ARG2$ --warning="$ARG3$" --critical="$ARG4$"'
} }
define command{ define command{
command_name check_sync_public_streams command_name check_sync_public_streams
command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u humbug -c 1:1 -a "/home/zulip/zulip/bots/sync-public-streams"' command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l nagios -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_procs -u zulip -c 1:1 -a "/home/zulip/zulip/bots/sync-public-streams"'
} }
define command{ define command{
command_name check_rabbitmq_queues command_name check_rabbitmq_queues
command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_queues' command_line /usr/lib/nagios/plugins/check_by_ssh -p $ARG1$ -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_queues'
} }
define command{ define command{
command_name check_rabbitmq_consumers command_name check_rabbitmq_consumers
command_line /usr/lib/nagios/plugins/check_by_ssh -p 22 -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_consumers $ARG1$' command_line /usr/lib/nagios/plugins/check_by_ssh -p 22 -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_rabbitmq_consumers $ARG1$'
} }
define command{ define command{
@ -133,7 +133,7 @@ define command {
define command { define command {
command_name check_fts_update_log command_name check_fts_update_log
command_line /usr/lib/nagios/plugins/check_by_ssh -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_fts_update_log' command_line /usr/lib/nagios/plugins/check_by_ssh -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_fts_update_log'
} }
define command { define command {
@ -143,10 +143,10 @@ define command {
define command { define command {
command_name check_postgres_backup command_name check_postgres_backup
command_line /usr/lib/nagios/plugins/check_by_ssh -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_postgres_backup' command_line /usr/lib/nagios/plugins/check_by_ssh -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_postgres_backup'
} }
define command { define command {
command_name check_email_mirror command_name check_email_mirror
command_line /usr/lib/nagios/plugins/check_by_ssh -l humbug -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_email_mirror' command_line /usr/lib/nagios/plugins/check_by_ssh -l zulip -t 30 -i /var/lib/nagios/.ssh/id_rsa -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_email_mirror'
} }

2
servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag
View File

@ -20,7 +20,7 @@ def report(state, msg):
exit(states[state]) exit(states[state])
def get_loc_over_ssh(host, func): def get_loc_over_ssh(host, func):
return subprocess.check_output(['ssh', host, '-l', 'humbug', return subprocess.check_output(['ssh', host, '-l', 'zulip',
'psql -t -c "SELECT %s()"' % (func,)]) 'psql -t -c "SELECT %s()"' % (func,)])
def loc_to_abs_offset(loc_str): def loc_to_abs_offset(loc_str):

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

@ -1,4 +1,4 @@
user humbug; user zulip;
# The rest of the file is the non-commented part of the Debian default config. # The rest of the file is the non-commented part of the Debian default config.

2
servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf
View File

@ -1,4 +1,4 @@
[program:feedback-bot] [program:feedback-bot]
command=/home/zulip/zulip/bots/feedback-bot command=/home/zulip/zulip/bots/feedback-bot
autostart=true autostart=true
user=humbug user=zulip

4
servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf
View File

@ -33,7 +33,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/statsd.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/statsd.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/statsd directory=/home/zulip/statsd
@ -45,7 +45,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/graphiti.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/graphiti.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/graphiti directory=/home/zulip/graphiti

6
servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf
View File

@ -5,10 +5,10 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/zmirror.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/zmirror.log ; stdout log path, NONE for none; default AUTO
environment=HOME="/home/zulip",USER="humbug" environment=HOME="/home/zulip",USER="zulip"
[program:sync-public-streams] [program:sync-public-streams]
command=python /home/zulip/zulip/bots/sync-public-streams command=python /home/zulip/zulip/bots/sync-public-streams
@ -17,7 +17,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/sync-public-streams.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/sync-public-streams.log ; stdout log path, NONE for none; default AUTO
environment=HOME="/home/zulip" environment=HOME="/home/zulip"

22
servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf
View File

@ -23,7 +23,7 @@ stopsignal=HUP ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
;stopasgroup=false ; send stop signal to the UNIX process group (default false) ;stopasgroup=false ; send stop signal to the UNIX process group (default false)
;killasgroup=false ; SIGKILL the UNIX process group (def false) ;killasgroup=false ; SIGKILL the UNIX process group (def false)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/django.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/django.log ; stdout log path, NONE for none; default AUTO
;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) ;stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB)
@ -39,7 +39,7 @@ stdout_logfile=/var/log/zulip/django.log ; stdout log path, NONE for none
;serverurl=AUTO ; override serverurl computation (childutils) ;serverurl=AUTO ; override serverurl computation (childutils)
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
socket=unix:///home/zulip/deployments/fastcgi-socket socket=unix:///home/zulip/deployments/fastcgi-socket
socket_owner=humbug:humbug socket_owner=zulip:zulip
socket_mode=0700 socket_mode=0700
[program:zulip-tornado] [program:zulip-tornado]
@ -49,7 +49,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/tornado.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/tornado.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
@ -61,7 +61,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-user-activity.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/events-user-activity.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
@ -73,7 +73,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-user-activity-interval.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/events-user-activity-interval.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
@ -85,7 +85,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-user-presence.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/events-user-presence.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
@ -97,7 +97,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-signups.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/events-signups.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
@ -109,7 +109,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-confirmation-emails.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/events-confirmation-emails.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
@ -121,7 +121,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-missedmessage_reminders.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/events-missedmessage_reminders.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
@ -133,7 +133,7 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-slow_queries.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/events-slow_queries.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/ directory=/home/zulip/deployments/current/
@ -156,4 +156,4 @@ programs=zulip-events-user-activity,zulip-events-user-activity-interval,zulip-ev
;enable server restarts without requiring superuser access. This assumes that this is the only service being controlled by supervisord on this machine. ;enable server restarts without requiring superuser access. This assumes that this is the only service being controlled by supervisord on this machine.
[unix_http_server] [unix_http_server]
chown=humbug:humbug chown=zulip:zulip

2
servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf
View File

@ -5,6 +5,6 @@ autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM) stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=humbug ; setuid to this UNIX account to run the program user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false) redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/fts-updates.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/fts-updates.log ; stdout log path, NONE for none; default AUTO

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

@ -3,7 +3,7 @@
[unix_http_server] [unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file) file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; socket file mode (default 0700) chmod=0700 ; socket file mode (default 0700)
chown=humbug chown=zulip
[supervisord] [supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)

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

@ -47,8 +47,8 @@ class zulip::app_frontend {
} }
file { "/home/zulip/tornado": file { "/home/zulip/tornado":
ensure => directory, ensure => directory,
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 755, mode => 755,
} }
file { "/etc/redis/redis.conf": file { "/etc/redis/redis.conf":

22
servers/puppet/modules/zulip/manifests/base.pp
View File

@ -12,20 +12,20 @@ class zulip::base {
apt::key {"A529EF65": apt::key {"A529EF65":
source => "http://apt.zulip.com/ops.asc", source => "http://apt.zulip.com/ops.asc",
} }
apt::sources_list {"humbug": apt::sources_list {"zulip":
ensure => present, ensure => present,
content => 'deb http://apt.zulip.com/ops wheezy main', content => 'deb http://apt.zulip.com/ops wheezy main',
} }
group { 'humbug': group { 'zulip':
ensure => present, ensure => present,
gid => '1000', gid => '1000',
} }
user { 'humbug': user { 'zulip':
ensure => present, ensure => present,
uid => '1000', uid => '1000',
gid => '1000', gid => '1000',
require => Group['humbug'], require => Group['zulip'],
shell => '/bin/bash', shell => '/bin/bash',
home => '/home/zulip', home => '/home/zulip',
managehome => true, managehome => true,
@ -34,15 +34,15 @@ class zulip::base {
ensure => file, ensure => file,
require => File['/home/zulip/.ssh'], require => File['/home/zulip/.ssh'],
mode => 600, mode => 600,
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
source => 'puppet:///modules/zulip/authorized_keys', source => 'puppet:///modules/zulip/authorized_keys',
} }
file { '/home/zulip/.ssh': file { '/home/zulip/.ssh':
ensure => directory, ensure => directory,
require => User['humbug'], require => User['zulip'],
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 600, mode => 600,
} }
@ -102,8 +102,8 @@ class zulip::base {
file { '/var/log/zulip': file { '/var/log/zulip':
ensure => 'directory', ensure => 'directory',
owner => 'humbug', owner => 'zulip',
group => 'humbug', group => 'zulip',
mode => 640, mode => 640,
} }

6
servers/puppet/modules/zulip/manifests/builder.pp
View File

@ -13,8 +13,8 @@ class zulip::builder {
file { "/home/zulip/.sbuildrc": file { "/home/zulip/.sbuildrc":
require => Package[sbuild], require => Package[sbuild],
ensure => file, ensure => file,
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/builder/sbuildrc", source => "puppet:///modules/zulip/builder/sbuildrc",
} }
@ -32,7 +32,7 @@ class zulip::builder {
} }
exec { "adduser root sbuild": } exec { "adduser root sbuild": }
exec { "adduser humbug sbuild": } exec { "adduser zulip sbuild": }
chroot { "precise": chroot { "precise":
distro => "ubuntu", distro => "ubuntu",
ensure => present, ensure => present,

20
servers/puppet/modules/zulip/manifests/prod_app_frontend.pp
View File

@ -18,40 +18,40 @@ class zulip::prod_app_frontend {
"/srv/www/dist/apps/", "/srv/www/dist/apps/mac/", "/srv/www/dist/apps/", "/srv/www/dist/apps/mac/",
"/srv/www/dist/apps/win/" ]: "/srv/www/dist/apps/win/" ]:
ensure => "directory", ensure => "directory",
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
} }
file { "/srv/www/dist/apps/mac/sparkle.xml": file { "/srv/www/dist/apps/mac/sparkle.xml":
ensure => file, ensure => file,
require => File['/srv/www/dist/apps/mac/'], require => File['/srv/www/dist/apps/mac/'],
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/sparkle/mac/sparkle.xml", source => "puppet:///modules/zulip/sparkle/mac/sparkle.xml",
} }
file { "/srv/www/dist/apps/mac/sparkle-changelog.html": file { "/srv/www/dist/apps/mac/sparkle-changelog.html":
ensure => file, ensure => file,
require => File['/srv/www/dist/apps/mac/'], require => File['/srv/www/dist/apps/mac/'],
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/sparkle/mac/sparkle-changelog.html", source => "puppet:///modules/zulip/sparkle/mac/sparkle-changelog.html",
} }
file { "/srv/www/dist/apps/win/sparkle.xml": file { "/srv/www/dist/apps/win/sparkle.xml":
ensure => file, ensure => file,
require => File['/srv/www/dist/apps/win/'], require => File['/srv/www/dist/apps/win/'],
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/sparkle/win/sparkle.xml", source => "puppet:///modules/zulip/sparkle/win/sparkle.xml",
} }
file { "/srv/www/dist/apps/win/sparkle-changelog.html": file { "/srv/www/dist/apps/win/sparkle-changelog.html":
ensure => file, ensure => file,
require => File['/srv/www/dist/apps/win/'], require => File['/srv/www/dist/apps/win/'],
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/sparkle/win/sparkle-changelog.html", source => "puppet:///modules/zulip/sparkle/win/sparkle-changelog.html",
} }

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

@ -80,8 +80,8 @@ class zulip::stats {
file { "/home/zulip/graphiti/config/settings.yml": file { "/home/zulip/graphiti/config/settings.yml":
ensure => file, ensure => file,
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/graphiti/settings.yml", source => "puppet:///modules/zulip/graphiti/settings.yml",
} }

10
servers/puppet/modules/zulip/manifests/trac.pp
View File

@ -13,16 +13,16 @@ class zulip::trac {
ensure => present, ensure => present,
} }
file { "/home/zulip/trac/conf/trac.ini": file { "/home/zulip/trac/conf/trac.ini":
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/trac.ini", source => "puppet:///modules/zulip/trac.ini",
require => User['humbug'], require => User['zulip'],
} }
file { "/home/zulip/trac/cgi-bin/": file { "/home/zulip/trac/cgi-bin/":
recurse => true, recurse => true,
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/trac/cgi-bin/", source => "puppet:///modules/zulip/trac/cgi-bin/",
} }

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

@ -17,8 +17,8 @@ class zulip::zmirror_personals {
'/home/zulip/mirror_status']: '/home/zulip/mirror_status']:
ensure => directory, ensure => directory,
mode => 644, mode => 644,
owner => "humbug", owner => "zulip",
group => "humbug", group => "zulip",
} }
file { "/etc/cron.d/test_zephyr_personal_mirrors": file { "/etc/cron.d/test_zephyr_personal_mirrors":

2
tools/backup
View File

@ -25,7 +25,7 @@ function commit {
cd ../message_logs cd ../message_logs
for h in staging.zulip.net prod0.zulip.net; do for h in staging.zulip.net prod0.zulip.net; do
rsync -v humbug@$h:logs/event_log/events.* . rsync -v zulip@$h:logs/event_log/events.* .
done done
git add events.* git add events.*
commit commit

4
tools/post-receive
View File

@ -2,10 +2,10 @@
# #
# Zulip's post-receive hook. There is a symlink # Zulip's post-receive hook. There is a symlink
# from /home/git/repositories/eng/zulip.git/hooks/post-receive # from /home/git/repositories/eng/zulip.git/hooks/post-receive
# to ~humbug/humbug/tools/post-receive # to ~zulip/zulip/tools/post-receive
# on git.zulip.net. So to deploy changes to this script, run # on git.zulip.net. So to deploy changes to this script, run
# #
# ssh humbug@git.zulip.net 'cd humbug; git pull' # ssh zulip@git.zulip.net 'cd zulip; git pull'
# #
# To send the Zulip notices, this script calls out to our # To send the Zulip notices, this script calls out to our
# for-distribution git hook (under api/integrations/); since the git # for-distribution git hook (under api/integrations/); since the git

4
tools/restart-server
View File

@ -15,8 +15,8 @@ os.chdir(deploy_path)
if os.path.exists("/etc/humbug-server"): if os.path.exists("/etc/humbug-server"):
with open("/etc/humbug-machinetype") as mtf: with open("/etc/humbug-machinetype") as mtf:
if pwd.getpwuid(os.getuid())[0] != "humbug": if pwd.getpwuid(os.getuid())[0] != "zulip":
logging.error("Must be run as user 'humbug'.") logging.error("Must be run as user 'zulip'.")
sys.exit(1) sys.exit(1)
# Send a statsd event on restarting the server # Send a statsd event on restarting the server

2
zerver/views/__init__.py
View File

@ -444,7 +444,7 @@ def webathena_kerberos_login(request, user_profile,
# TODO: Send these data via (say) rabbitmq # TODO: Send these data via (say) rabbitmq
try: try:
subprocess.check_call(["ssh", "humbug@zmirror2.zulip.net", "--", subprocess.check_call(["ssh", "zulip@zmirror2.zulip.net", "--",
"/home/zulip/zulip/bots/process_ccache", "/home/zulip/zulip/bots/process_ccache",
user, user,
user_profile.api_key, user_profile.api_key,