diff --git a/modules/services/forgejo/module.nix b/modules/services/forgejo/module.nix index f8a9e72..0953db5 100644 --- a/modules/services/forgejo/module.nix +++ b/modules/services/forgejo/module.nix @@ -19,7 +19,6 @@ in { config = mkIf cfg.enable { modules.system.services = { database.postgresql.enable = true; - nginx.enable = true; }; networking.firewall.allowedTCPPorts = [ @@ -52,6 +51,8 @@ in { security.acme = let email = "charlie@charlieroot.dev"; in { + acceptTerms = true; + defaults.email = email; # testing server, do not use in production, but DO use it for setting things up. # it has much higher rate limits. # defaults.server = "https://acme-staging-v02.api.letsencrypt.org/directory"; diff --git a/modules/services/nginx/module.nix b/modules/services/nginx/module.nix deleted file mode 100644 index 71fdd49..0000000 --- a/modules/services/nginx/module.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - inherit (lib.modules) mkIf mkDefault; - inherit (lib.options) mkEnableOption; - cfg = config.modules.system.services.nginx; -in { - options.modules.system.services.nginx.enable = mkEnableOption "nginx"; - config = mkIf cfg.enable { - security = { - acme = { - acceptTerms = true; - defaults.email = "charlie@charlieroot.dev"; - }; - }; - services.ngingx = { - package = pkgs.nginxQuic; - statusPage = true; - - recommendedTlsSettings = true; - recommendedBrotliSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - recommendedZstdSettings = true; - - clientMaxBodySize = mkDefault "512m"; - }; - }; -}