Add pillar item to disable using upstart-based services

Fixes GH saltstack-formulas/nginx-formula#14.
This commit is contained in:
Mark Lee 2014-05-04 11:14:03 -07:00
parent 3c1b9f5c09
commit 59c2f8b21f
3 changed files with 11 additions and 2 deletions

View File

@ -7,6 +7,7 @@
file.absent
{% endfor %}
{% if pillar.get('nginx', {}).get('use_upstart', true) %}
{% set logger_types = ('access', 'error') %}
{% for log_type in logger_types %}
@ -36,6 +37,7 @@ nginx-logger-{{ log_type }}:
/etc/logrotate.d/nginx:
file:
- absent
{% endif %}
/etc/nginx:
file.directory:

View File

@ -1,4 +1,5 @@
{% set use_upstart = pillar.get('nginx', {}).get('use_upstart', true) %}
{% if use_upstart %}
nginx-old-init:
file:
- rename
@ -32,10 +33,12 @@ nginx-old-init-disable:
- module: nginx-old-init
- watch:
- file: nginx-old-init
{% endif %}
nginx:
pkg.installed:
- name: nginx
{% if use_upstart %}
file:
- managed
- name: /etc/init/nginx.conf
@ -48,13 +51,16 @@ nginx:
- pkg: nginx
- file: nginx-old-init
- module: nginx-old-init
{% endif %}
service:
- running
- enable: True
- restart: True
- watch:
{% if use_upstart %}
- file: nginx
{% endif %}
- file: /etc/nginx/nginx.conf
- file: /etc/nginx/conf.d/default.conf
- file: /etc/nginx/conf.d/example_ssl.conf
- pkg: nginx
- pkg: nginx

View File

@ -1,5 +1,6 @@
nginx:
install_from_source: True
use_upstart: True
with_luajit: False
with_openresty: True
modules: