summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2016-11-23 22:25:41 +0000
committerJohannes Löthberg <johannes@kyriasis.com>2016-11-23 22:25:41 +0000
commit844cbdc1a4cb7c87b87c213086081e03b2de5307 (patch)
tree53eaaf98fdb7e540d3156a330ce0a3925562ec1d
parent5cf1d9df3cedd0c73b17a819199b1da0bb71298e (diff)
downloadpillar-844cbdc1a4cb7c87b87c213086081e03b2de5307.tar.xz
nginx: Fixe https returns
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
-rw-r--r--theos/init.sls1
-rw-r--r--theos/nginx/git_kyriasis_com.sls2
-rw-r--r--theos/nginx/theos_kyriasis_com.sls8
-rw-r--r--theos/nginx/xan_kyriasis_com.sls4
4 files changed, 6 insertions, 9 deletions
diff --git a/theos/init.sls b/theos/init.sls
index 3303580..56f2ba5 100644
--- a/theos/init.sls
+++ b/theos/init.sls
@@ -2,6 +2,7 @@ include:
- theos.nginx.theos_kyriasis_com
- theos.nginx.xan_kyriasis_com
- theos.nginx.git_kyriasis_com
+ - theos.nginx.gerrit_kyriasis_com
- theos.opensmtpd
# vim: set ft=yaml et:
diff --git a/theos/nginx/git_kyriasis_com.sls b/theos/nginx/git_kyriasis_com.sls
index d2c8fb2..64865fd 100644
--- a/theos/nginx/git_kyriasis_com.sls
+++ b/theos/nginx/git_kyriasis_com.sls
@@ -9,7 +9,7 @@ nginx:
- server_name: git.kyriasis.com
- listen: 80
- listen: '[::]:80'
- - rewrite: '301 https://$server_name$request_uri'
+ - return: '301 https://$server_name$request_uri'
- server:
- server_name: git.kyriasis.com
diff --git a/theos/nginx/theos_kyriasis_com.sls b/theos/nginx/theos_kyriasis_com.sls
index 4b5f25d..cbcc756 100644
--- a/theos/nginx/theos_kyriasis_com.sls
+++ b/theos/nginx/theos_kyriasis_com.sls
@@ -9,7 +9,7 @@ nginx:
- server_name: theos.kyriasis.com
- listen: 80
- listen: '[::]:80'
- - rewrite: '301 https://$server_name$request_uri'
+ - return: '301 https://$server_name$request_uri'
- server:
- server_name: theos.kyriasis.com
@@ -58,8 +58,7 @@ nginx:
- expires: modified +24h
- location = /~kyrias/journal/10-mercurian-pronouns.html:
- - return 301:
- - https://web.archive.org/web/https://theos.kyriasis.com/~kyrias/journal/10-mercurian-pronouns.html
+ - return: '301 https://web.archive.org/web/https://theos.kyriasis.com/~kyrias/journal/10-mercurian-pronouns.html'
- location ~ \.(js|css|png):
- expires: modified +7d
@@ -105,8 +104,7 @@ nginx:
- expires: modified +24h
- location = /~kyrias/journal/10-mercurian-pronouns.html:
- - return 301:
- - https://web.archive.org/web/https://theos.kyriasis.com/~kyrias/journal/10-mercurian-pronouns.html
+ - return: '301 https://web.archive.org/web/https://theos.kyriasis.com/~kyrias/journal/10-mercurian-pronouns.html'
- location ~ \.(js|css|png):
- expires: modified +7d
diff --git a/theos/nginx/xan_kyriasis_com.sls b/theos/nginx/xan_kyriasis_com.sls
index ad81a1a..f4a9d0f 100644
--- a/theos/nginx/xan_kyriasis_com.sls
+++ b/theos/nginx/xan_kyriasis_com.sls
@@ -9,9 +9,7 @@ nginx:
- server_name: xan.kyriasis.com
- listen: 80
- listen: '[::]:80'
- - rewrite:
- - '^ https://$server_name$request_uri?'
- - permanent
+ - return: '301 https://$server_name$request_uri'
- server:
- server_name: xan.kyriasis.com