From 0da43d98613d4a4c82ea2c9c76d0797e443315bc Mon Sep 17 00:00:00 2001 From: Travis J Parker Date: Wed, 8 Oct 2014 10:17:06 -0700 Subject: [PATCH 1/3] move upstart-related states to their own file --- nginx/common.sls | 32 -------------------------------- nginx/init.sls | 3 +++ nginx/upstart.sls | 28 ++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 32 deletions(-) create mode 100644 nginx/upstart.sls diff --git a/nginx/common.sls b/nginx/common.sls index 091fdeb..b98dc64 100644 --- a/nginx/common.sls +++ b/nginx/common.sls @@ -7,38 +7,6 @@ file.absent {% endfor %} -{% if pillar.get('nginx', {}).get('use_upstart', true) %} -{% set logger_types = ('access', 'error') %} - -{% for log_type in logger_types %} -/var/log/nginx/{{ log_type }}.log: - file.absent - -nginx-logger-{{ log_type }}: - file: - - managed - - name: /etc/init/nginx-logger-{{ log_type }}.conf - - template: jinja - - user: root - - group: root - - mode: 440 - - source: salt://nginx/templates/upstart-logger.jinja - - context: - type: {{ log_type }} - service: - - running - - enable: True - - require: - - file: nginx-logger-{{ log_type }} - - require_in: - - service: nginx -{% endfor %} - -/etc/logrotate.d/nginx: - file: - - absent -{% endif %} - /etc/nginx: file.directory: - user: root diff --git a/nginx/init.sls b/nginx/init.sls index b2659aa..89cdc30 100644 --- a/nginx/init.sls +++ b/nginx/init.sls @@ -1,5 +1,8 @@ include: - nginx.common +{% if pillar.get('nginx', {}).get('use_upstart', true) %} + - nginx.upstart +{% endif %} {% if pillar.get('nginx', {}).get('user_auth_enabled', true) %} - nginx.users {% endif %} diff --git a/nginx/upstart.sls b/nginx/upstart.sls new file mode 100644 index 0000000..b8ae8e5 --- /dev/null +++ b/nginx/upstart.sls @@ -0,0 +1,28 @@ +{% set logger_types = ('access', 'error') %} + +{% for log_type in logger_types %} +/var/log/nginx/{{ log_type }}.log: + file.absent + +nginx-logger-{{ log_type }}: + file: + - managed + - name: /etc/init/nginx-logger-{{ log_type }}.conf + - template: jinja + - user: root + - group: root + - mode: 440 + - source: salt://nginx/templates/upstart-logger.jinja + - context: + type: {{ log_type }} + service: + - running + - enable: True + - require: + - file: nginx-logger-{{ log_type }} + - require_in: + - service: nginx +{% endfor %} + +/etc/logrotate.d/nginx: + file.absent From 02faa5c88a113290aa3c38dc68fb7599040d07c6 Mon Sep 17 00:00:00 2001 From: Travis J Parker Date: Wed, 8 Oct 2014 11:06:56 -0700 Subject: [PATCH 2/3] ignore vim droppings please --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3268211 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.*.sw? From 37fb389133d0fe2c47519f886f9f57a03b9f7fdf Mon Sep 17 00:00:00 2001 From: Travis J Parker Date: Wed, 8 Oct 2014 11:44:15 -0700 Subject: [PATCH 3/3] syslog support in the sysvinit paradigm the debian package installs the nginx service just fine, but the extra fifo->syslog functionality would be nice to have under debian as well. --- nginx/init.sls | 2 + nginx/sysvinit.sls | 31 ++++++++ nginx/templates/sysvinit-logger.jinja | 103 ++++++++++++++++++++++++++ pillar.example | 1 + 4 files changed, 137 insertions(+) create mode 100644 nginx/sysvinit.sls create mode 100644 nginx/templates/sysvinit-logger.jinja diff --git a/nginx/init.sls b/nginx/init.sls index 89cdc30..66db126 100644 --- a/nginx/init.sls +++ b/nginx/init.sls @@ -2,6 +2,8 @@ include: - nginx.common {% if pillar.get('nginx', {}).get('use_upstart', true) %} - nginx.upstart +{% elif pillar.get('nginx', {}).get('use_sysvinit', true) %} + - nginx.sysvinit {% endif %} {% if pillar.get('nginx', {}).get('user_auth_enabled', true) %} - nginx.users diff --git a/nginx/sysvinit.sls b/nginx/sysvinit.sls new file mode 100644 index 0000000..dc1832d --- /dev/null +++ b/nginx/sysvinit.sls @@ -0,0 +1,31 @@ +{% set logger_types = ('access', 'error') %} + +{% for log_type in logger_types %} +/var/log/nginx/{{ log_type }}.log: + file.absent + +nginx-logger-{{ log_type }}: + file: + - managed + - name: /etc/init.d/nginx-logger-{{ log_type }} + - template: jinja + - user: root + - group: root + - mode: 755 + - source: salt://nginx/templates/sysvinit-logger.jinja + - context: + type: {{ log_type }} + service: + - running + - enable: True + - require: + - file: nginx-logger-{{ log_type }} + - require_in: + - service: nginx + cmd: + - wait + - name: /usr/sbin/update-rc.d nginx-logger-{{ log_type }} defaults +{% endfor %} + +/etc/logrotate.d/nginx: + file.absent diff --git a/nginx/templates/sysvinit-logger.jinja b/nginx/templates/sysvinit-logger.jinja new file mode 100644 index 0000000..82b0702 --- /dev/null +++ b/nginx/templates/sysvinit-logger.jinja @@ -0,0 +1,103 @@ +#!/bin/bash +# /etc/init.d/nginx-logger-{{ type }} +# + +NAME=nginx-logger-{{ type }} +DESC="syslog forwarder for nginx {{type}} logs" +DAEMON=/usr/bin/logger +DAEMON_ARGS=" -f /var/log/nginx/{{ type }}.fifo -t nginx -p {% if type == 'error' %}warn{% else %}debug{% endif %}" +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the daemon program isn't installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +. /lib/lsb/init-functions + +do_start() { + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + pid=$(pidofproc -p $PIDFILE $DAEMON) + if [ -n "$pid" ]; then + return 1; + fi + + if [ ! -r /var/log/nginx/{{ type }}.fifo ]; then + mkdir -p /var/log/nginx + mkfifo /var/log/nginx/{{ type }}.fifo + chown root.root /var/log/nginx/{{ type }}.fifo + chmod 660 /var/log/nginx/{{ type }}.fifo + fi + + start-stop-daemon --start --quiet --background --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS +} + +do_stop() { + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + pids=$(pidof -x $DAEMON) + if [ $? -eq 0 ]; then + echo $pids | xargs kill 2&1>/dev/null + RETVAL=0 + else + RETVAL=1 + fi + + [ "$RETVAL" = 2 ] && return 2 + rm -f $PIDFILE + return "$RETVAL" +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + restart|force-reload) + [ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: /etc/init.d/nginx-logger-{{ type }} {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +exit 0 diff --git a/pillar.example b/pillar.example index 757b0a4..517b4fc 100644 --- a/pillar.example +++ b/pillar.example @@ -1,6 +1,7 @@ nginx: install_from_source: True use_upstart: True + use_sysvinit: False user_auth_enabled: True with_luajit: False with_openresty: True