From b378ddd483717252c0da9ac7b0dc9369a0d2ff99 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sun, 16 May 2021 10:03:35 -0400 Subject: Update nginx config Disable dav Add nextcloud endpoint --- config/web-server.nix | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'config') diff --git a/config/web-server.nix b/config/web-server.nix index 9cb9130..8f008d1 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -18,7 +18,7 @@ services.nginx = { enable = true; package = pkgs.nginxStable.override { - modules = with pkgs.nginxModules; [ dav rtmp ]; + modules = with pkgs.nginxModules; [ rtmp ]; # dav }; recommendedProxySettings = true; appendHttpConfig = '' @@ -116,26 +116,24 @@ autoindex on; ''; }; - locations."/dav" = { - root = "/storage/srv/kj.orbekk.com"; - extraConfig = '' - auth_basic webdav; - # htpasswd -c /opt/secret/nginx-webdav.htpasswd - dav_ext_methods PROPFIND OPTIONS; - auth_basic_user_file "/opt/secret/nginx-webdav.htpasswd"; - dav_methods put delete mkcol copy move; - dav_access user:rw group:rw all:rw; - create_full_put_path on; - autoindex on; - ''; - }; + # locations."/dav" = { + # root = "/storage/srv/kj.orbekk.com"; + # extraConfig = '' + # auth_basic webdav; + # # htpasswd -c /opt/secret/nginx-webdav.htpasswd + # dav_ext_methods PROPFIND OPTIONS; + # auth_basic_user_file "/opt/secret/nginx-webdav.htpasswd"; + # dav_methods put delete mkcol copy move; + # dav_access user:rw group:rw all:rw; + # create_full_put_path on; + # autoindex on; + # ''; + # }; }; "git.orbekk.com" = template // { locations."/".proxyPass = "http://localhost:11103"; }; - "journal.orbekk.com" = template // { - locations."/".proxyPass = "http://localhost:${toString pjournal_loc.port}"; - }; + nextcloud = template; }; }; } -- cgit v1.2.3