From 2ca22205aac684d49b977d0a8553e4d3c3ec6212 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 25 May 2025 00:49:54 +0200 Subject: [PATCH] fix(nginx): fix enable option for service --- modules/nixos/services/cinny/default.nix | 5 ++--- modules/nixos/services/ente-auth/default.nix | 7 +++---- modules/nixos/services/forgejo/default.nix | 7 +++---- modules/nixos/services/linkwarden/default.nix | 9 ++++----- modules/nixos/services/searxng/default.nix | 14 ++++++-------- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/modules/nixos/services/cinny/default.nix b/modules/nixos/services/cinny/default.nix index f5f9250..7b14cbd 100644 --- a/modules/nixos/services/cinny/default.nix +++ b/modules/nixos/services/cinny/default.nix @@ -14,9 +14,8 @@ in options.${namespace}.services.cinny = { enable = mkEnableOption "Cinny"; nginx = { - enable = mkEnableOption { - description = "Enable nginx for this service."; - type = types.bool; + enable = mkEnableOption "Enable nginx for this service." + // { default = true; }; }; diff --git a/modules/nixos/services/ente-auth/default.nix b/modules/nixos/services/ente-auth/default.nix index 2c5b2e2..a0b192e 100644 --- a/modules/nixos/services/ente-auth/default.nix +++ b/modules/nixos/services/ente-auth/default.nix @@ -27,10 +27,9 @@ in }; nginx = { - enable = mkEnableOption { - description = "Enable nginx for this service."; - type = types.bool; - default = true; + enable = mkEnableOption "Enable nginx for this service." + // { + default = true; }; }; diff --git a/modules/nixos/services/forgejo/default.nix b/modules/nixos/services/forgejo/default.nix index c12c778..4d36167 100644 --- a/modules/nixos/services/forgejo/default.nix +++ b/modules/nixos/services/forgejo/default.nix @@ -14,10 +14,9 @@ in options.${namespace}.services.forgejo = { enable = mkEnableOption "Forgejo"; nginx = { - enable = mkEnableOption { - description = "Enable nginx for this service."; - type = types.bool; - default = true; + enable = mkEnableOption "Enable nginx for this service." + // { + default = true; }; }; diff --git a/modules/nixos/services/linkwarden/default.nix b/modules/nixos/services/linkwarden/default.nix index dd62819..c2236e4 100644 --- a/modules/nixos/services/linkwarden/default.nix +++ b/modules/nixos/services/linkwarden/default.nix @@ -22,10 +22,9 @@ in enable = mkEnableOption "Linkwarden"; package = lib.mkPackageOption pkgs.awesome-flake "linkwarden" { }; nginx = { - enable = mkEnableOption { - description = "Enable nginx for this service."; - type = types.bool; - default = true; + enable = mkEnableOption "Enable nginx for this service." + // { + default = true; }; }; @@ -249,7 +248,7 @@ in virtualHosts."${cfg.domain}" = { forceSSL = true; useACMEHost = "stahl.sh"; - locations."/".proxyPass = "http://:${cfg.host}" + builtins.toString cfg.port; + locations."/".proxyPass = "http://${cfg.host}:${builtins.toString cfg.port}"; }; }; diff --git a/modules/nixos/services/searxng/default.nix b/modules/nixos/services/searxng/default.nix index be17713..1a44d38 100644 --- a/modules/nixos/services/searxng/default.nix +++ b/modules/nixos/services/searxng/default.nix @@ -20,17 +20,15 @@ in }; nginx = { - enable = mkEnableOption { - description = "Enable nginx for this service."; - type = types.bool; - default = true; + enable = mkEnableOption "Enable nginx for this service." + // { + default = true; }; }; - + redlib = { - enable = mkEnableOption { - description = "Whether or not to enable redlib."; - type = type.bool; + enable = mkEnableOption "Whether or not to enable redlib." + // { default = true; };