summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-12-05 23:48:27 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-12-05 23:48:27 +0100
commitc75e337d62dcb2baca0c5e347d895ecda2f10b6a (patch)
treeef043d58789bbb9a61df787befac5642c5a91026
parent4b1dba1e174462615bf032c2e756cb80198f04f7 (diff)
downloadnixos-c75e337d62dcb2baca0c5e347d895ecda2f10b6a.tar
nixos-c75e337d62dcb2baca0c5e347d895ecda2f10b6a.tar.gz
nixos-c75e337d62dcb2baca0c5e347d895ecda2f10b6a.tar.bz2
nixos-c75e337d62dcb2baca0c5e347d895ecda2f10b6a.tar.xz
nixos-c75e337d62dcb2baca0c5e347d895ecda2f10b6a.zip
-rw-r--r--custom/ymir-nginx.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index 31fa74f4..ca14b8e8 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -186,18 +186,19 @@ in {
186 server { 186 server {
187 listen *:80; 187 listen *:80;
188 listen [::]:80; 188 listen [::]:80;
189 listen *:443 ssl;
190 listen [::]:443 ssl;
191 189
192 server_name ~^webdav\.(yggdrasil\.li|141\.li|praseodym\.org)$; 190 server_name ~^webdav\.(yggdrasil\.li|141\.li|praseodym\.org)$;
193 191
194 include ${acme}; 192 include ${acme};
193 }
195 194
196 location ~ ^/(.+?)(/.*)?$ { 195 server {
197 if ($scheme = 'http') { 196 listen *:443 ssl;
198 rewrite ^ https://$host$request_uri? permanent; 197 listen [::]:443 ssl;
199 }
200 198
199 server_name ~^webdav\.(yggdrasil\.li|141\.li|praseodym\.org)$;
200
201 location ~ ^/(.+?)(/.*)?$ {
201 alias /srv/www/webdav/$1$2; 202 alias /srv/www/webdav/$1$2;
202 autoindex on; 203 autoindex on;
203 204