Skip to content

Commit 78d7d2b

Browse files
committed
Create placeholders for all templates
1 parent 6bef5cb commit 78d7d2b

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

templates/web.socketed.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ run:
2424
listen unix:/shared/nginx.https.sock ssl;
2525
set_real_ip_from unix:;
2626
- replace:
27-
filename: "/etc/nginx/conf.d/outlets/before-server/10-redirect-http-to-https.conf"
27+
filename: "/etc/nginx/conf.d/outlets/before-server/20-redirect-http-to-https.conf"
2828
from: /listen 80;(\nlisten \[::\]:80;)?/
2929
to: |
3030
listen unix:/shared/nginx.http.sock;

templates/web.ssl.template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run:
33
cmd:
44
- "mkdir -p /shared/ssl/"
55
- file:
6-
path: "/etc/nginx/conf.d/outlets/before-server/10-redirect-http-to-https.conf"
6+
path: "/etc/nginx/conf.d/outlets/before-server/20-redirect-http-to-https.conf"
77
contents: |
88
server {
99
listen 80;
@@ -43,6 +43,6 @@ run:
4343
cmd:
4444
- |-
4545
if [ -f "/proc/net/if_inet6" ] ; then
46-
sed -i 's/listen 80;/listen 80;\nlisten [::]:80;/g' /etc/nginx/conf.d/outlets/before-server/10-redirect-http-to-https.conf
46+
sed -i 's/listen 80;/listen 80;\nlisten [::]:80;/g' /etc/nginx/conf.d/outlets/before-server/20-redirect-http-to-https.conf
4747
sed -i 's/listen 443 ssl;/listen 443 ssl;\nlisten [::]:443 ssl;/g' /etc/nginx/conf.d/outlets/server/20-https.conf
4848
fi

templates/web.template.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,15 @@ run:
143143

144144
# Create placeholders for the Nginx outlets
145145
- "mkdir -p /etc/nginx/conf.d/outlets/before-server"
146+
- "touch /etc/nginx/conf.d/outlets/before-server/20-redirect-http-to-https.conf"
147+
- "touch /etc/nginx/conf.d/outlets/before-server/30-ratelimited.conf"
146148
- "mkdir -p /etc/nginx/conf.d/outlets/server"
149+
- "touch /etc/nginx/conf.d/outlets/server/10-http.conf"
150+
- "touch /etc/nginx/conf.d/outlets/server/20-https.conf"
151+
- "touch /etc/nginx/conf.d/outlets/server/30-offline-page.conf"
147152
- "mkdir -p /etc/nginx/conf.d/outlets/discourse"
148-
- "touch /etc/nginx/conf.d/outlets/before-server/10-redirect-http-to-https.conf"
153+
- "touch /etc/nginx/conf.d/outlets/discourse/20-https.conf"
154+
- "touch /etc/nginx/conf.d/outlets/discourse/30-ratelimited.conf"
149155

150156
- replace:
151157
filename: /etc/nginx/nginx.conf

0 commit comments

Comments
 (0)