salt/www/nginx/init.sls in salted-rails-0.0.4 vs salt/www/nginx/init.sls in salted-rails-0.0.5

- old
+ new

@@ -3,15 +3,28 @@ - name: nginx-full service: - running - enable: True - reload: True - - watch: + #- watch: #- file: {{ pillar['etc_dir'] }}nginx/nginx.conf #- file: {{ pillar['etc_dir'] }}nginx/sites-enabled/* - - file: {{ pillar['etc_dir'] }}nginx/* - require: - - file: {{ pillar['etc_dir'] }}nginx/nginx.conf + #- file: {{ pillar['etc_dir'] }}nginx/admin.d/* + - require: + - file.directory: admin-d + - pkg: nginx + +admin-d: + file.directory: + - name: {{ pillar['etc_dir'] }}nginx/admin.d + - user: root + - group: root + - mode: 755 + - require: + - pkg: nginx + +# require: +# - file: {{ pillar['etc_dir'] }}nginx/nginx.conf #{{ pillar['etc_dir'] }}nginx/nginx.conf: # file.managed: # - source: salt://www/nginx/etc/nginx/nginx.conf # - user: root