Merge pull request #31 from Oefenweb/pr-30

Added supervisord nodaemon option as variable

Author: tersmitten

README.md

@@ -27,6 +27,7 @@ Set up the latest or a specific version of supervisor in Ubuntu systems.
 * `supervisor_inet_http_server_username` [default: `admin`]: The username required for authentication to this HTTP server **Make sure to change!**
 * `supervisor_inet_http_server_password` [default: `'4ubA&Et=ASPe'`]: The password required for authentication to this HTTP server. This can be a cleartext password, or can be specified as a SHA-1 hash if prefixed by the string `{SHA}` **Make sure to change!**
 
+* `supervisor_supervisord_nodaemon` [default: `false`]: If true, supervisord will start in the foreground instead of daemonizing
 * `supervisor_supervisord_logfile` [default: `/var/log/supervisor/supervisord.log`]: The path to the activity log of the supervisord process
 * `supervisor_supervisord_pidfile` [default: `/var/run/supervisord.pid`]: The location in which supervisord keeps its pid file
 * `supervisor_supervisord_childlogdir` [default: `/var/log/supervisor`]: The directory used for `AUTO` child log files

defaults/main.yml

@@ -15,6 +15,7 @@ supervisor_inet_http_server_port: 9001
 supervisor_inet_http_server_username: admin
 supervisor_inet_http_server_password: '4ubA&Et=ASPe'
 
+supervisor_supervisord_nodaemon: false
 supervisor_supervisord_logfile: /var/log/supervisor/supervisord.log
 supervisor_supervisord_pidfile: /var/run/supervisord.pid
 supervisor_supervisord_childlogdir: /var/log/supervisor

templates/etc/supervisor/supervisord.conf.j2

@@ -23,6 +23,7 @@ password = {{ supervisor_inet_http_server_password }}
 {% endif %}
 
 [supervisord]
+nodaemon={{ 'true' if supervisor_supervisord_nodaemon | bool else 'false' }} ; (supervisord nodaemon option;default false)
 logfile={{ supervisor_supervisord_logfile }} ; (main log file;default $CWD/supervisord.log)
 pidfile={{ supervisor_supervisord_pidfile }} ; (supervisord pidfile;default supervisord.pid)
 childlogdir={{ supervisor_supervisord_childlogdir }} ; ('AUTO' child log dir, default $TEMP)