From adcf8d43e465d9d4905df8162e1b5edb288553a6 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 6 Dec 2017 13:26:21 +0100
Subject: Revert to FTP

---
 custom/ymir-nginx.nix | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

(limited to 'custom')

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 {
         listen [::]:443 ssl;
         server_name ~^(.*\.)?bragi\.(yggdrasil\.li|141\.li)$;
 
+        include ${acme};
+
         location / {
           auth_basic "Reverse proxy to bragi";
           auth_basic_user_file /srv/www/bragi/htpasswd;
@@ -182,39 +184,6 @@ in {
           proxy_pass http://bragi.asgard.yggdrasil/;
         }
       }
-
-      server {
-        listen *:80;
-        listen [::]:80;
-        server_name ~^webdav\.(yggdrasil\.li|141\.li|praseodym\.org)$;
-
-        include ${acme};
-
-        location / {
-          return 301 https://$host$request_uri;
-        }
-      }
-
-      server {
-        listen *:443 ssl;
-        listen [::]:443 ssl;
-
-        server_name ~^webdav\.(yggdrasil\.li|141\.li|praseodym\.org)$;
-
-        client_body_temp_path /tmp/webdav;
-
-        location ~ ^/(.+?)(/.*)?$ {
-          alias /srv/www/webdav/$1$2;
-          autoindex on;
-        
-          auth_basic "WebDAV directory ‘$1’";
-          auth_basic_user_file /srv/www/webdav/$1.htpasswd;
-
-          dav_methods PUT DELETE MKCOL COPY MOVE;
-          create_full_put_path on;
-          dav_access user:rw group:r all:r;
-        }
-      }
     '';
   };
 }
-- 
cgit v1.2.3