Import supervisord config into puppet.

(imported from commit e3247d11c8054f07fc44172eb21b7d76fd230615)
This commit is contained in:
Tim Abbott 2013-08-26 11:32:04 -04:00
parent 134da30fdf
commit e2ea7c3c14
2 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,28 @@
; supervisor config file
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
; the below section must remain in the config file for RPC
; (supervisorctl/web interface) to work, additional interfaces may be
; added by defining them in separate rpcinterface: sections
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
; The [include] section can just contain the "files" setting. This
; setting can list multiple files (separated by whitespace or
; newlines). It can also contain wildcards. The filenames are
; interpreted as relative to this file. Included files *cannot*
; include files themselves.
[include]
files = /etc/supervisor/conf.d/*.conf

View File

@ -21,6 +21,16 @@ class zulip::supervisor {
restart => "supervisorctl reload" restart => "supervisorctl reload"
} }
file { "/etc/supervisor/supervisord.conf":
require => Package[supervisor],
ensure => file,
owner => "root",
group => "root",
mode => 644,
source => "puppet:///modules/zulip/supervisord/supervisord.conf",
notify => Service["supervisor"],
}
exec { "fix_supervisor_socket_permissions": exec { "fix_supervisor_socket_permissions":
command => "chown humbug:humbug /var/run/supervisor.sock", command => "chown humbug:humbug /var/run/supervisor.sock",
unless => "bash -c 'ls -ld /var/run/supervisor.sock | cut -f 3-4 -d\" \" | grep -q \"^humbug humbug$\"'", unless => "bash -c 'ls -ld /var/run/supervisor.sock | cut -f 3-4 -d\" \" | grep -q \"^humbug humbug$\"'",