diff --git a/nginx/source.sls b/nginx/source.sls index 7ac0e91..c900147 100644 --- a/nginx/source.sls +++ b/nginx/source.sls @@ -222,6 +222,7 @@ nginx: - group: root - mode: 0755 - context: + service_name: {{ service_name }} sbin_dir: {{ sbin_dir }} pid_path: {{ pid_path }} service: diff --git a/nginx/templates/nginx.init.jinja b/nginx/templates/nginx.init.jinja index 2ed3c91..e3086c7 100644 --- a/nginx/templates/nginx.init.jinja +++ b/nginx/templates/nginx.init.jinja @@ -1,23 +1,23 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: nginx +# Provides: {{ service_name }} # Required-Start: $local_fs $remote_fs $network $syslog # Required-Stop: $local_fs $remote_fs $network $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: starts the nginx web server -# Description: starts nginx using start-stop-daemon +# Short-Description: starts the {{ service_name }} web server +# Description: starts {{ service_name }} using start-stop-daemon ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON={{ sbin_dir }}/nginx -NAME=nginx -DESC=nginx +NAME={{ service_name }} +DESC={{ service_name }} # Include nginx defaults if available -if [ -f /etc/default/nginx ]; then - . /etc/default/nginx +if [ -f /etc/default/$NAME ]; then + . /etc/default/$NAME fi test -x $DAEMON || exit 0