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

[manual] Rename humbug=>zulip in supervisor configuration. 

This will probably require shutting down all the supervisor processes
and restarting them to deploy properly.

(imported from commit ce687078980b43be495c49f52ed6aa0e25cdad00)
This commit is contained in:
Tim Abbott 2013-09-25 14:26:50 -04:00 committed by Steve Howell
parent 31a445e42e
commit bb902f5296
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
; Supervisor config file for stats.humbughq.com ; Supervisor config file for stats.zulip.net
; It runs graphite, graphiti, statsd ; It runs graphite, graphiti, statsd
[program:humbug-carbon-cache] [program:zulip-carbon-cache]
command=python /opt/graphite/bin/carbon-cache.py --debug start command=python /opt/graphite/bin/carbon-cache.py --debug start
priority=200 ; the relative start priority (default 999) priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -14,7 +14,7 @@ redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/carbon-cache.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/carbon-cache.log ; stdout log path, NONE for none; default AUTO
directory=/home/humbug/ directory=/home/humbug/
[program:humbug-carbon-aggregator] [program:zulip-carbon-aggregator]
command=python /opt/graphite/bin/carbon-aggregator.py --debug start command=python /opt/graphite/bin/carbon-aggregator.py --debug start
priority=200 ; the relative start priority (default 999) priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -26,7 +26,7 @@ redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/carbon-aggregator.log ; stdout log path, NONE for none; default AUTO stdout_logfile=/var/log/zulip/carbon-aggregator.log ; stdout log path, NONE for none; default AUTO
directory=/home/humbug/ directory=/home/humbug/
[program:humbug-statsd] [program:zulip-statsd]
command=node stats.js /home/humbug/humbug/servers/puppet/modules/zulip/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) priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -39,7 +39,7 @@ stdout_logfile=/var/log/zulip/statsd.log ; stdout log path, NONE for non
directory=/home/humbug/statsd directory=/home/humbug/statsd
[program:humbug-graphiti] [program:zulip-graphiti]
command=/home/humbug/humbug/tools/run-graphiti command=/home/humbug/humbug/tools/run-graphiti
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected) autorestart=true ; whether/when to restart (default: unexpected)
@ -50,5 +50,5 @@ 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/humbug/graphiti directory=/home/humbug/graphiti
[group:humbug-stats] [group:zulip-stats]
programs=humbug-carbon-cache,humbug-carbon-aggregator,humbug-statsd,humbug-graphiti programs=zulip-carbon-cache,zulip-carbon-aggregator,zulip-statsd,zulip-graphiti

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

@ -1,5 +1,5 @@
; Supervisor config file. ; Supervisor config file.
; on Debian squeeze, place me in /etc/supervisor/conf.d/humbug.conf ; on Debian squeeze, place me in /etc/supervisor/conf.d/zulip.conf
; ;
; For more information on the config file, please see: ; For more information on the config file, please see:
; http://supervisord.org/configuration.html ; http://supervisord.org/configuration.html
@ -7,7 +7,7 @@
; Note: shell expansion ("~" or "$HOME") is not supported. Environment ; Note: shell expansion ("~" or "$HOME") is not supported. Environment
; variables can be expanded using this syntax: "%(ENV_HOME)s". ; variables can be expanded using this syntax: "%(ENV_HOME)s".
[fcgi-program:humbug-django] [fcgi-program:zulip-django]
command=python /home/humbug/deployments/current/manage.py runfcgi daemonize=False maxchildren=20 ; the program (relative uses PATH, can take args) command=python /home/humbug/deployments/current/manage.py runfcgi daemonize=False maxchildren=20 ; the program (relative uses PATH, can take args)
;process_name=%(program_name)s ; process_name expr (default %(program_name)s) ;process_name=%(program_name)s ; process_name expr (default %(program_name)s)
;numprocs=1 ; number of processes copies to start (def 1) ;numprocs=1 ; number of processes copies to start (def 1)
@ -42,7 +42,7 @@ socket=unix:///home/humbug/deployments/fastcgi-socket
socket_owner=humbug:humbug socket_owner=humbug:humbug
socket_mode=0700 socket_mode=0700
[program:humbug-tornado] [program:zulip-tornado]
command=python /home/humbug/deployments/current/manage.py runtornado localhost:9993 command=python /home/humbug/deployments/current/manage.py runtornado localhost:9993
priority=200 ; the relative start priority (default 999) priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -54,7 +54,7 @@ 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/humbug/deployments/current/ directory=/home/humbug/deployments/current/
[program:humbug-events-user-activity] [program:zulip-events-user-activity]
command=python /home/humbug/deployments/current/manage.py process_queue user_activity command=python /home/humbug/deployments/current/manage.py process_queue user_activity
priority=300 ; the relative start priority (default 999) priority=300 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -66,7 +66,7 @@ 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/humbug/deployments/current/ directory=/home/humbug/deployments/current/
[program:humbug-events-user-activity-interval] [program:zulip-events-user-activity-interval]
command=python /home/humbug/deployments/current/manage.py process_queue user_activity_interval command=python /home/humbug/deployments/current/manage.py process_queue user_activity_interval
priority=300 ; the relative start priority (default 999) priority=300 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -78,7 +78,7 @@ 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/humbug/deployments/current/ directory=/home/humbug/deployments/current/
[program:humbug-events-user-presence] [program:zulip-events-user-presence]
command=python /home/humbug/deployments/current/manage.py process_queue user_presence command=python /home/humbug/deployments/current/manage.py process_queue user_presence
priority=300 ; the relative start priority (default 999) priority=300 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -90,7 +90,7 @@ 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/humbug/deployments/current/ directory=/home/humbug/deployments/current/
[program:humbug-events-signups] [program:zulip-events-signups]
command=python /home/humbug/deployments/current/manage.py process_queue signups command=python /home/humbug/deployments/current/manage.py process_queue signups
priority=400 ; the relative start priority (default 999) priority=400 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -102,7 +102,7 @@ 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/humbug/deployments/current/ directory=/home/humbug/deployments/current/
[program:humbug-events-confirmation-emails] [program:zulip-events-confirmation-emails]
command=python /home/humbug/deployments/current/manage.py process_queue invites command=python /home/humbug/deployments/current/manage.py process_queue invites
priority=500 ; the relative start priority (default 999) priority=500 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -114,7 +114,7 @@ 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/humbug/deployments/current/ directory=/home/humbug/deployments/current/
[program:humbug-events-missedmessage_reminders] [program:zulip-events-missedmessage_reminders]
command=python /home/humbug/deployments/current/manage.py process_queue missedmessage_emails command=python /home/humbug/deployments/current/manage.py process_queue missedmessage_emails
priority=600 ; the relative start priority (default 999) priority=600 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true) autostart=true ; start at supervisord start (default: true)
@ -142,8 +142,8 @@ directory=/home/humbug/deployments/current/
; create one or more 'real' group: sections to create "heterogeneous" ; create one or more 'real' group: sections to create "heterogeneous"
; process groups. ; process groups.
[group:humbug-workers] [group:zulip-workers]
programs=humbug-events-user-activity,humbug-events-user-activity-interval,humbug-events-user-presence,humbug-events-signups,humbug-events-confirmation-emails,humbug-events-missedmessage_reminders ; each refers to 'x' in [program:x] definitions programs=zulip-events-user-activity,zulip-events-user-activity-interval,zulip-events-user-presence,zulip-events-signups,zulip-events-confirmation-emails,zulip-events-missedmessage_reminders ; each refers to 'x' in [program:x] definitions
; The [include] section can just contain the "files" setting. This ; The [include] section can just contain the "files" setting. This
; setting can list multiple files (separated by whitespace or ; setting can list multiple files (separated by whitespace or

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

@ -36,13 +36,13 @@ class zulip::app_frontend {
mode => 644, mode => 644,
source => "puppet:///modules/zulip/memcached.conf", source => "puppet:///modules/zulip/memcached.conf",
} }
file { "/etc/supervisor/conf.d/humbug.conf": file { "/etc/supervisor/conf.d/zulip.conf":
require => Package[supervisor], require => Package[supervisor],
ensure => file, ensure => file,
owner => "root", owner => "root",
group => "root", group => "root",
mode => 644, mode => 644,
source => "puppet:///modules/zulip/supervisor/conf.d/humbug.conf", source => "puppet:///modules/zulip/supervisor/conf.d/zulip.conf",
notify => Service["supervisor"], notify => Service["supervisor"],
} }
file { "/home/humbug/tornado": file { "/home/humbug/tornado":