fix docs redirects include configuration (#508)

python · Oct 2, 2024 · a45ca9a · a45ca9a
1 parent 36994b9
commit a45ca9a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/salt/docs/config/nginx.docs-backend.conf b/salt/docs/config/nginx.docs-backend.conf
@@ -18,7 +18,7 @@ server {
 
     # The redirect config for docs.python.org is in a separate file
     # to allow automatic testing via Hurl (https://hurl.dev/)
-    include docs-redirects.conf;
+    include sites.d/docs/redirects.conf;
 }
 
 server {

diff --git a/salt/docs/init.sls b/salt/docs/init.sls
@@ -122,26 +122,26 @@ docsbuild-full:
     - group: root
     - mode: "0644"
 
-/etc/nginx/sites.d/docs-backend.conf:
+/etc/nginx/sites.d/docs/redirects.conf:
   file.managed:
-    - source: salt://docs/config/nginx.docs-backend.conf
+    - source: salt://docs/config/nginx.docs-redirects.conf
     - user: root
     - group: root
     - mode: "0644"
+    - makedirs: True
     - require:
-      - file: /etc/nginx/sites.d/
-      - file: /etc/nginx/fastly_params
-      - file: /etc/nginx/conf.d/docs-redirects.conf
+      - pkg: nginx
 
-/etc/nginx/conf.d/docs-redirects.conf:
+/etc/nginx/sites.d/docs-backend.conf:
   file.managed:
-    - source: salt://docs/config/nginx.docs-redirects.conf
+    - source: salt://docs/config/nginx.docs-backend.conf
     - user: root
     - group: root
     - mode: "0644"
     - require:
-      - pkg: nginx
-
+      - file: /etc/nginx/sites.d/
+      - file: /etc/nginx/fastly_params
+      - file: /etc/nginx/sites.d/docs/redirects.conf
 
 /etc/consul.d/service-docs.json:
   file.managed: