Skip to content

Commit a45ca9a

Browse files
authored
fix docs redirects include configuration (#508)
1 parent 36994b9 commit a45ca9a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

salt/docs/config/nginx.docs-backend.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ server {
1818

1919
# The redirect config for docs.python.org is in a separate file
2020
# to allow automatic testing via Hurl (https://hurl.dev/)
21-
include docs-redirects.conf;
21+
include sites.d/docs/redirects.conf;
2222
}
2323

2424
server {

salt/docs/init.sls

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,26 +122,26 @@ docsbuild-full:
122122
- group: root
123123
- mode: "0644"
124124

125-
/etc/nginx/sites.d/docs-backend.conf:
125+
/etc/nginx/sites.d/docs/redirects.conf:
126126
file.managed:
127-
- source: salt://docs/config/nginx.docs-backend.conf
127+
- source: salt://docs/config/nginx.docs-redirects.conf
128128
- user: root
129129
- group: root
130130
- mode: "0644"
131+
- makedirs: True
131132
- require:
132-
- file: /etc/nginx/sites.d/
133-
- file: /etc/nginx/fastly_params
134-
- file: /etc/nginx/conf.d/docs-redirects.conf
133+
- pkg: nginx
135134

136-
/etc/nginx/conf.d/docs-redirects.conf:
135+
/etc/nginx/sites.d/docs-backend.conf:
137136
file.managed:
138-
- source: salt://docs/config/nginx.docs-redirects.conf
137+
- source: salt://docs/config/nginx.docs-backend.conf
139138
- user: root
140139
- group: root
141140
- mode: "0644"
142141
- require:
143-
- pkg: nginx
144-
142+
- file: /etc/nginx/sites.d/
143+
- file: /etc/nginx/fastly_params
144+
- file: /etc/nginx/sites.d/docs/redirects.conf
145145

146146
/etc/consul.d/service-docs.json:
147147
file.managed:

0 commit comments

Comments
 (0)