Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3805493
D3026.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D3026.id.diff
View Options
diff --git a/roles/paas-docker/nginx/config.sls b/roles/paas-docker/nginx/config.sls
--- a/roles/paas-docker/nginx/config.sls
+++ b/roles/paas-docker/nginx/config.sls
@@ -17,10 +17,6 @@
# :: containers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{{ dirs.etc }}/nginx/vhosts:
- file.directory:
- - dir_mode: 755
-
{{ dirs.etc }}/nginx/vhosts/000-fallback.conf:
file.managed:
- source: salt://roles/paas-docker/nginx/files/vhosts/base/fallback.conf
diff --git a/roles/saas-mediawiki/nginx/config.sls b/roles/saas-mediawiki/nginx/config.sls
--- a/roles/saas-mediawiki/nginx/config.sls
+++ b/roles/saas-mediawiki/nginx/config.sls
@@ -13,8 +13,9 @@
# :: MediaWiki and SaaS location blocks
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{{ dirs.etc }}/nginx/includes:
+saas_mediawiki_nginx_includes:
file.recurse:
+ - name: {{ dirs.etc }}/nginx/includes
- source: salt://roles/saas-mediawiki/nginx/files/includes
- dir_mode: 755
- file_mode: 644
@@ -26,8 +27,9 @@
# vhosts folder
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{{ dirs.etc }}/nginx/vhosts:
+saas_mediawiki_nginx_vhosts:
file.recurse:
+ - name: {{ dirs.etc }}/nginx/vhosts
- source: salt://roles/saas-mediawiki/nginx/files/vhosts
- dir_mode: 755
- file_mode: 644
diff --git a/roles/webserver-legacy/nginx/config.sls b/roles/webserver-legacy/nginx/config.sls
--- a/roles/webserver-legacy/nginx/config.sls
+++ b/roles/webserver-legacy/nginx/config.sls
@@ -14,8 +14,9 @@
# :: application-specific code
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{{ dirs.etc }}/nginx/includes:
+webserver_legacy_nginx_includes:
file.recurse:
+ - name: {{ dirs.etc }}/nginx/includes
- source: salt://roles/webserver-legacy/nginx/files/includes
- dir_mode: 755
- file_mode: 644
@@ -24,8 +25,9 @@
# vhosts folder
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{{ dirs.etc }}/nginx/vhosts:
+webserver_legacy_nginx_vhosts:
file.recurse:
+ - name: {{ dirs.etc }}/nginx/vhosts
- source: salt://roles/webserver-legacy/nginx/files/vhosts
- dir_mode: 755
- file_mode: 644
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Dec 1, 02:49 (21 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2273955
Default Alt Text
D3026.id.diff (2 KB)
Attached To
Mode
D3026: Avoid name conflicts in nginx unit built on concrete webserver roles
Attached
Detach File
Event Timeline
Log In to Comment