summaryrefslogtreecommitdiff
path: root/custom/ymir-nginx.nix
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-12-06 13:26:21 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-12-06 13:26:21 +0100
commitadcf8d43e465d9d4905df8162e1b5edb288553a6 (patch)
tree967371d6a6aeaf49493da46a93e2d6500bca5170 /custom/ymir-nginx.nix
parent68562e007cdd190303a4fbe14c31b2fc1efd6f9a (diff)
downloadnixos-adcf8d43e465d9d4905df8162e1b5edb288553a6.tar
nixos-adcf8d43e465d9d4905df8162e1b5edb288553a6.tar.gz
nixos-adcf8d43e465d9d4905df8162e1b5edb288553a6.tar.bz2
nixos-adcf8d43e465d9d4905df8162e1b5edb288553a6.tar.xz
nixos-adcf8d43e465d9d4905df8162e1b5edb288553a6.zip
Revert to FTP
Diffstat (limited to 'custom/ymir-nginx.nix')
-rw-r--r--custom/ymir-nginx.nix35
1 files changed, 2 insertions, 33 deletions
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index 00c83af8..a1de81c3 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -175,6 +175,8 @@ in {
175 listen [::]:443 ssl; 175 listen [::]:443 ssl;
176 server_name ~^(.*\.)?bragi\.(yggdrasil\.li|141\.li)$; 176 server_name ~^(.*\.)?bragi\.(yggdrasil\.li|141\.li)$;
177 177
178 include ${acme};
179
178 location / { 180 location / {
179 auth_basic "Reverse proxy to bragi"; 181 auth_basic "Reverse proxy to bragi";
180 auth_basic_user_file /srv/www/bragi/htpasswd; 182 auth_basic_user_file /srv/www/bragi/htpasswd;
@@ -182,39 +184,6 @@ in {
182 proxy_pass http://bragi.asgard.yggdrasil/; 184 proxy_pass http://bragi.asgard.yggdrasil/;
183 } 185 }
184 } 186 }
185
186 server {
187 listen *:80;
188 listen [::]:80;
189 server_name ~^webdav\.(yggdrasil\.li|141\.li|praseodym\.org)$;
190
191 include ${acme};
192
193 location / {
194 return 301 https://$host$request_uri;
195 }
196 }
197
198 server {
199 listen *:443 ssl;
200 listen [::]:443 ssl;
201
202 server_name ~^webdav\.(yggdrasil\.li|141\.li|praseodym\.org)$;
203
204 client_body_temp_path /tmp/webdav;
205
206 location ~ ^/(.+?)(/.*)?$ {
207 alias /srv/www/webdav/$1$2;
208 autoindex on;
209
210 auth_basic "WebDAV directory ‘$1’";
211 auth_basic_user_file /srv/www/webdav/$1.htpasswd;
212
213 dav_methods PUT DELETE MKCOL COPY MOVE;
214 create_full_put_path on;
215 dav_access user:rw group:r all:r;
216 }
217 }
218 ''; 187 '';
219 }; 188 };
220} 189}