fix nginx merge conflicts

2026-06-16 07:08:41 +02:00 · 2023-05-15 11:40:12 -04:00
parent db47256cdd 9a3c997779
commit 7a4fea7a12
46 changed files with 234 additions and 174 deletions
@@ -12,18 +12,11 @@ include:
 # Drop the correct nginx config based on role
 nginxconfdir:
  file.directory:
-    - name: /opt/so/conf/nginx/html
+    - name: /opt/so/conf/nginx
    - user: 939
    - group: 939
    - makedirs: True

-nginxhtml:
-  file.recurse:
-    - name: /opt/so/conf/nginx/html
-    - source: salt://nginx/html/
-    - user: 939
-    - group: 939
-
 nginxconf:
  file.managed:
    - name: /opt/so/conf/nginx/nginx.conf