move upstart-related states to their own file

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

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 %}

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