From 3b7292302e41d81725b338aa867490886b44c1f3 Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 2 Nov 2024 13:49:17 -0400 Subject: [PATCH] Services: couldn't get webdav working right. Screw it - I'll just keep using my current setup --- hosts/Hevana/default.nix | 7 --- modules/secrets/default.nix | Bin 5040 -> 4686 bytes modules/services/webdav.nix | 95 ------------------------------------ 3 files changed, 102 deletions(-) delete mode 100644 modules/services/webdav.nix diff --git a/hosts/Hevana/default.nix b/hosts/Hevana/default.nix index ce0f5f0..4ff47ce 100644 --- a/hosts/Hevana/default.nix +++ b/hosts/Hevana/default.nix @@ -20,7 +20,6 @@ let # List of subdomains to add to the TLS certificate subdomains = with config.secrets.services; [ - dav.url forgejo.url gremlin-lab.url jellyfin.url @@ -235,12 +234,6 @@ in ram = 4096; }; }; - webdav = { - enable = true; - home = "${services-root}/webdav"; - url = config.secrets.services.webdav.url; - users = config.secrets.services.webdav.users; - }; }; users.aires = { diff --git a/modules/secrets/default.nix b/modules/secrets/default.nix index 707a180a110803fd3f51c3e69cdcfbc13ae12806..693ab7c66ea5e3e0af9f5900ec1ca16f856d358c 100644 GIT binary patch literal 4686 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 Q_yNk7$O*27way@CT3=>7lK=n! literal 5040 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"\s*\} - - # Failregex to match "invalid username" and extract remote_address only (if applicable) - failregex += ^.*invalid username\s*\{.*"remote_address":\s*""\s*\} - - ignoreregex = - ''; - - "fail2ban/jail.d/webdav.conf".text = '' - [webdav] - enabled = true - port = ${builtins.toString port} - filter = webdav - logpath = /var/log/webdav/fail2ban.log - banaction = iptables-allports - ignoreself = false - ''; - }; - - systemd.services = { - webdav.unitConfig.RequiresMountsFor = cfg.home; - nginx.wants = [ config.systemd.services.webdav.name ]; - }; - }; -}