diff --git a/bots/zmirror_private.conf.template b/bots/zmirror_private.conf.template index 556de90eda..2156988434 100644 --- a/bots/zmirror_private.conf.template +++ b/bots/zmirror_private.conf.template @@ -5,7 +5,7 @@ autostart=true ; start at supervisord start (default: true) autorestart=true ; whether/when to restart (default: unexpected) stopsignal=TERM ; signal used to kill process (default TERM) 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) 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" diff --git a/servers/install-server b/servers/install-server index f5a0f675c5..ee70a3830c 100755 --- a/servers/install-server +++ b/servers/install-server @@ -85,7 +85,7 @@ userdel admin passwd -d root puppet apply -e 'class {"zulip": machinetype => "$type"}' 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 apt-get -y upgrade if [ -e "/etc/init.d/nginx" ]; then @@ -98,8 +98,8 @@ fi EOF # 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 -ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lhumbug </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 diff --git a/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror b/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror index f7826c1f36..0aa50e8625 100644 --- a/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror +++ b/servers/puppet/modules/zulip/files/cron.d/zephyr-mirror @@ -22,5 +22,5 @@ SHELL=/bin/bash # For more information see the manual pages of crontab(5) and cron(8) # # m h dom mon dow command -35 * * * * humbug /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 +35 * * * * zulip /home/zulip/zulip/bots/zmirror-renew-kerberos +*/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 diff --git a/servers/puppet/modules/zulip/files/munin/plugin-conf.d/munin-node.conf b/servers/puppet/modules/zulip/files/munin/plugin-conf.d/munin-node.conf index 47069abb74..1945e41a11 100644 --- a/servers/puppet/modules/zulip/files/munin/plugin-conf.d/munin-node.conf +++ b/servers/puppet/modules/zulip/files/munin/plugin-conf.d/munin-node.conf @@ -119,8 +119,8 @@ env.PGUSER postgres env.PGPORT 5432 [humbug_send_receive] -user humbug -group humbug +user zulip +group zulip [rabbitmq_messages] env.queue_warn 50 @@ -138,5 +138,5 @@ env.queue_crit 40000000 user root [tornado_event_queues] -user humbug -group humbug +user zulip +group zulip diff --git a/servers/puppet/modules/zulip/files/nagios3/commands.cfg b/servers/puppet/modules/zulip/files/nagios3/commands.cfg index c4daaad2e9..924e238e49 100644 --- a/servers/puppet/modules/zulip/files/nagios3/commands.cfg +++ b/servers/puppet/modules/zulip/files/nagios3/commands.cfg @@ -68,7 +68,7 @@ define command{ define command{ 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{ @@ -83,37 +83,37 @@ define command{ define command{ 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{ 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{ 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{ 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{ 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{ 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{ 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{ @@ -133,7 +133,7 @@ define command { define command { 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 { @@ -143,10 +143,10 @@ define command { define command { 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 { 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' } diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag b/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag index 8bc1cb8f6a..eadf7e6d70 100755 --- a/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag +++ b/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag @@ -20,7 +20,7 @@ def report(state, msg): exit(states[state]) 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,)]) def loc_to_abs_offset(loc_str): diff --git a/servers/puppet/modules/zulip/files/nginx/nginx.conf b/servers/puppet/modules/zulip/files/nginx/nginx.conf index dd4d474a2e..8378f2c32c 100644 --- a/servers/puppet/modules/zulip/files/nginx/nginx.conf +++ b/servers/puppet/modules/zulip/files/nginx/nginx.conf @@ -1,4 +1,4 @@ -user humbug; +user zulip; # The rest of the file is the non-commented part of the Debian default config. diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf index 8b876d326f..ce6689cb5c 100644 --- a/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf +++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf @@ -1,4 +1,4 @@ [program:feedback-bot] command=/home/zulip/zulip/bots/feedback-bot autostart=true -user=humbug +user=zulip diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf index c0b21d32f5..0498f3de33 100644 --- a/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf +++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf @@ -33,7 +33,7 @@ autostart=true ; start at supervisord start (default: true) autorestart=true ; whether/when to restart (default: unexpected) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/statsd.log ; stdout log path, NONE for none; default AUTO directory=/home/zulip/statsd @@ -45,7 +45,7 @@ autostart=true ; start at supervisord start (default: true) autorestart=true ; whether/when to restart (default: unexpected) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/graphiti.log ; stdout log path, NONE for none; default AUTO directory=/home/zulip/graphiti diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf index 7a981592e7..bbcb52a82d 100644 --- a/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf +++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf @@ -5,10 +5,10 @@ autostart=true ; start at supervisord start (default: true) autorestart=true ; whether/when to restart (default: unexpected) stopsignal=TERM ; signal used to kill process (default TERM) 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) 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] 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) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/sync-public-streams.log ; stdout log path, NONE for none; default AUTO environment=HOME="/home/zulip" diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf index 024529d099..c21578e707 100644 --- a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf +++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip.conf @@ -23,7 +23,7 @@ stopsignal=HUP ; signal used to kill process (default TERM) stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10) ;stopasgroup=false ; send stop signal to the UNIX process group (default 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) 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) @@ -39,7 +39,7 @@ stdout_logfile=/var/log/zulip/django.log ; stdout log path, NONE for none ;serverurl=AUTO ; override serverurl computation (childutils) directory=/home/zulip/deployments/current/ socket=unix:///home/zulip/deployments/fastcgi-socket -socket_owner=humbug:humbug +socket_owner=zulip:zulip socket_mode=0700 [program:zulip-tornado] @@ -49,7 +49,7 @@ autostart=true ; start at supervisord start (default: true) autorestart=true ; whether/when to restart (default: unexpected) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/tornado.log ; stdout log path, NONE for none; default AUTO 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) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/events-user-activity.log ; stdout log path, NONE for none; default AUTO 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) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/events-user-activity-interval.log ; stdout log path, NONE for none; default AUTO 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) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/events-user-presence.log ; stdout log path, NONE for none; default AUTO 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) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/events-signups.log ; stdout log path, NONE for none; default AUTO 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) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/events-confirmation-emails.log ; stdout log path, NONE for none; default AUTO 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) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/events-missedmessage_reminders.log ; stdout log path, NONE for none; default AUTO 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) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/events-slow_queries.log ; stdout log path, NONE for none; default AUTO 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. [unix_http_server] -chown=humbug:humbug \ No newline at end of file +chown=zulip:zulip \ No newline at end of file diff --git a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf index e1cf9c1fb8..677b9b02c6 100644 --- a/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf +++ b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf @@ -5,6 +5,6 @@ autostart=true ; start at supervisord start (default: true) autorestart=true ; whether/when to restart (default: unexpected) stopsignal=TERM ; signal used to kill process (default TERM) 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) stdout_logfile=/var/log/zulip/fts-updates.log ; stdout log path, NONE for none; default AUTO diff --git a/servers/puppet/modules/zulip/files/supervisor/supervisord.conf b/servers/puppet/modules/zulip/files/supervisor/supervisord.conf index 2b1f29621b..2eed37acd3 100644 --- a/servers/puppet/modules/zulip/files/supervisor/supervisord.conf +++ b/servers/puppet/modules/zulip/files/supervisor/supervisord.conf @@ -3,7 +3,7 @@ [unix_http_server] file=/var/run/supervisor.sock ; (the path to the socket file) chmod=0700 ; socket file mode (default 0700) -chown=humbug +chown=zulip [supervisord] logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log) diff --git a/servers/puppet/modules/zulip/manifests/app_frontend.pp b/servers/puppet/modules/zulip/manifests/app_frontend.pp index f11e007662..8f2e69f7e3 100644 --- a/servers/puppet/modules/zulip/manifests/app_frontend.pp +++ b/servers/puppet/modules/zulip/manifests/app_frontend.pp @@ -47,8 +47,8 @@ class zulip::app_frontend { } file { "/home/zulip/tornado": ensure => directory, - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 755, } file { "/etc/redis/redis.conf": diff --git a/servers/puppet/modules/zulip/manifests/base.pp b/servers/puppet/modules/zulip/manifests/base.pp index acc7d65998..a1421d055f 100644 --- a/servers/puppet/modules/zulip/manifests/base.pp +++ b/servers/puppet/modules/zulip/manifests/base.pp @@ -12,20 +12,20 @@ class zulip::base { apt::key {"A529EF65": source => "http://apt.zulip.com/ops.asc", } - apt::sources_list {"humbug": + apt::sources_list {"zulip": ensure => present, content => 'deb http://apt.zulip.com/ops wheezy main', } - group { 'humbug': + group { 'zulip': ensure => present, gid => '1000', } - user { 'humbug': + user { 'zulip': ensure => present, uid => '1000', gid => '1000', - require => Group['humbug'], + require => Group['zulip'], shell => '/bin/bash', home => '/home/zulip', managehome => true, @@ -34,15 +34,15 @@ class zulip::base { ensure => file, require => File['/home/zulip/.ssh'], mode => 600, - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", source => 'puppet:///modules/zulip/authorized_keys', } file { '/home/zulip/.ssh': ensure => directory, - require => User['humbug'], - owner => "humbug", - group => "humbug", + require => User['zulip'], + owner => "zulip", + group => "zulip", mode => 600, } @@ -102,8 +102,8 @@ class zulip::base { file { '/var/log/zulip': ensure => 'directory', - owner => 'humbug', - group => 'humbug', + owner => 'zulip', + group => 'zulip', mode => 640, } diff --git a/servers/puppet/modules/zulip/manifests/builder.pp b/servers/puppet/modules/zulip/manifests/builder.pp index 763a270928..c73c91ca85 100644 --- a/servers/puppet/modules/zulip/manifests/builder.pp +++ b/servers/puppet/modules/zulip/manifests/builder.pp @@ -13,8 +13,8 @@ class zulip::builder { file { "/home/zulip/.sbuildrc": require => Package[sbuild], ensure => file, - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, source => "puppet:///modules/zulip/builder/sbuildrc", } @@ -32,7 +32,7 @@ class zulip::builder { } exec { "adduser root sbuild": } - exec { "adduser humbug sbuild": } + exec { "adduser zulip sbuild": } chroot { "precise": distro => "ubuntu", ensure => present, diff --git a/servers/puppet/modules/zulip/manifests/prod_app_frontend.pp b/servers/puppet/modules/zulip/manifests/prod_app_frontend.pp index d6b7caaa89..8507598e05 100644 --- a/servers/puppet/modules/zulip/manifests/prod_app_frontend.pp +++ b/servers/puppet/modules/zulip/manifests/prod_app_frontend.pp @@ -18,40 +18,40 @@ class zulip::prod_app_frontend { "/srv/www/dist/apps/", "/srv/www/dist/apps/mac/", "/srv/www/dist/apps/win/" ]: ensure => "directory", - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, } file { "/srv/www/dist/apps/mac/sparkle.xml": ensure => file, require => File['/srv/www/dist/apps/mac/'], - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, source => "puppet:///modules/zulip/sparkle/mac/sparkle.xml", } file { "/srv/www/dist/apps/mac/sparkle-changelog.html": ensure => file, require => File['/srv/www/dist/apps/mac/'], - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, source => "puppet:///modules/zulip/sparkle/mac/sparkle-changelog.html", } file { "/srv/www/dist/apps/win/sparkle.xml": ensure => file, require => File['/srv/www/dist/apps/win/'], - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, source => "puppet:///modules/zulip/sparkle/win/sparkle.xml", } file { "/srv/www/dist/apps/win/sparkle-changelog.html": ensure => file, require => File['/srv/www/dist/apps/win/'], - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, source => "puppet:///modules/zulip/sparkle/win/sparkle-changelog.html", } diff --git a/servers/puppet/modules/zulip/manifests/stats.pp b/servers/puppet/modules/zulip/manifests/stats.pp index c1954feead..64591e9005 100644 --- a/servers/puppet/modules/zulip/manifests/stats.pp +++ b/servers/puppet/modules/zulip/manifests/stats.pp @@ -80,8 +80,8 @@ class zulip::stats { file { "/home/zulip/graphiti/config/settings.yml": ensure => file, - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, source => "puppet:///modules/zulip/graphiti/settings.yml", } diff --git a/servers/puppet/modules/zulip/manifests/trac.pp b/servers/puppet/modules/zulip/manifests/trac.pp index a728ed29bb..280bdb242d 100644 --- a/servers/puppet/modules/zulip/manifests/trac.pp +++ b/servers/puppet/modules/zulip/manifests/trac.pp @@ -13,16 +13,16 @@ class zulip::trac { ensure => present, } file { "/home/zulip/trac/conf/trac.ini": - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, source => "puppet:///modules/zulip/trac.ini", - require => User['humbug'], + require => User['zulip'], } file { "/home/zulip/trac/cgi-bin/": recurse => true, - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", mode => 644, source => "puppet:///modules/zulip/trac/cgi-bin/", } diff --git a/servers/puppet/modules/zulip/manifests/zmirror_personals.pp b/servers/puppet/modules/zulip/manifests/zmirror_personals.pp index d82ff89c5a..4f0542af19 100644 --- a/servers/puppet/modules/zulip/manifests/zmirror_personals.pp +++ b/servers/puppet/modules/zulip/manifests/zmirror_personals.pp @@ -17,8 +17,8 @@ class zulip::zmirror_personals { '/home/zulip/mirror_status']: ensure => directory, mode => 644, - owner => "humbug", - group => "humbug", + owner => "zulip", + group => "zulip", } file { "/etc/cron.d/test_zephyr_personal_mirrors": diff --git a/tools/backup b/tools/backup index 09d1bd7d91..b96b495090 100755 --- a/tools/backup +++ b/tools/backup @@ -25,7 +25,7 @@ function commit { cd ../message_logs 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 git add events.* commit diff --git a/tools/post-receive b/tools/post-receive index 13e32108e4..5e0bd9e0b3 100755 --- a/tools/post-receive +++ b/tools/post-receive @@ -2,10 +2,10 @@ # # Zulip's post-receive hook. There is a symlink # 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 # -# 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 # for-distribution git hook (under api/integrations/); since the git diff --git a/tools/restart-server b/tools/restart-server index e31280ba40..99b910ebad 100755 --- a/tools/restart-server +++ b/tools/restart-server @@ -15,8 +15,8 @@ os.chdir(deploy_path) if os.path.exists("/etc/humbug-server"): with open("/etc/humbug-machinetype") as mtf: - if pwd.getpwuid(os.getuid())[0] != "humbug": - logging.error("Must be run as user 'humbug'.") + if pwd.getpwuid(os.getuid())[0] != "zulip": + logging.error("Must be run as user 'zulip'.") sys.exit(1) # Send a statsd event on restarting the server diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index 687d979452..fb603d08bd 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -444,7 +444,7 @@ def webathena_kerberos_login(request, user_profile, # TODO: Send these data via (say) rabbitmq try: - subprocess.check_call(["ssh", "humbug@zmirror2.zulip.net", "--", + subprocess.check_call(["ssh", "zulip@zmirror2.zulip.net", "--", "/home/zulip/zulip/bots/process_ccache", user, user_profile.api_key,