Skip to content

Commit

Permalink
throw out supervisord-file and use default one
Browse files Browse the repository at this point in the history
  • Loading branch information
bebehei committed Jan 22, 2017
1 parent a25e593 commit 5c186ee
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 47 deletions.
9 changes: 9 additions & 0 deletions content/etc/supervisor/conf.d/apache2.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[program:apache2]
command=/opt/supervisor/apache2_supervisor
autorestart=true
startretries=3
# redirect output to stdout/stderr and do not use a regular logfile
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
8 changes: 8 additions & 0 deletions content/etc/supervisor/conf.d/fatalservicelistener.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[eventlistener:fatalservice]
command=/opt/supervisor/fatalservicelistener
events=PROCESS_STATE_FATAL
# redirect output to stdout/stderr and do not use a regular logfile
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
46 changes: 0 additions & 46 deletions content/etc/supervisor/conf.d/icinga2.conf
Original file line number Diff line number Diff line change
@@ -1,49 +1,3 @@
[unix_http_server]
file=/run/supervisor.sock
chmod=0700

[supervisord]
nodaemon=true
# log to /dev/null, as we're getting the output in our run-script
logfile=/dev/null
logfile_maxbytes=0
pidfile=/run/supervisord.pid

[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

[supervisorctl]
serverurl=unix:///run/supervisor.sock

[eventlistener:fatalservice]
command=/opt/supervisor/fatalservicelistener
events=PROCESS_STATE_FATAL
# redirect output to stdout/stderr and do not use a regular logfile
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0

[program:apache2]
command=/opt/supervisor/apache2_supervisor
autorestart=true
startretries=3
# redirect output to stdout/stderr and do not use a regular logfile
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0

[program:mysql]
command=/opt/supervisor/mysql_supervisor
autorestart=true
startretries=3
# redirect output to stdout/stderr and do not use a regular logfile
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0

[program:icinga2]
command=/opt/supervisor/icinga2_supervisor
autorestart=true
Expand Down
9 changes: 9 additions & 0 deletions content/etc/supervisor/conf.d/mysql.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[program:mysql]
command=/opt/supervisor/mysql_supervisor
autorestart=true
startretries=3
# redirect output to stdout/stderr and do not use a regular logfile
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
2 changes: 1 addition & 1 deletion content/opt/run
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ Icinga Web 2 (/icingaweb2) default credentials: ${ICINGAWEB2_ADMIN_USER}:${ICING
Starting Supervisor.
END

/usr/bin/supervisord -c /etc/supervisor/conf.d/icinga2.conf &
/usr/bin/supervisord -n &
trap "supervisorctl shutdown && wait" SIGTERM
wait

0 comments on commit 5c186ee

Please sign in to comment.