diff --git a/configuration/default.nix b/configuration/default.nix index b008454..e722628 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -71,7 +71,7 @@ domain = "tlater.net"; virtualHosts = let - host = port: extra: + proxyPassToPort = port: extra: lib.recursiveUpdate { forceSSL = true; enableACME = true; @@ -83,9 +83,9 @@ extra; domain = config.services.nginx.domain; in { - "${domain}" = host 3002 {serverAliases = ["www.${domain}"];}; - "gitea.${domain}" = host 3000 {}; - "nextcloud.${domain}" = host 3001 {}; + "${domain}" = proxyPassToPort 3002 {serverAliases = ["www.${domain}"];}; + "gitea.${domain}" = proxyPassToPort 3000 {}; + "nextcloud.${domain}" = proxyPassToPort 3001 {}; }; }; diff --git a/configuration/linode.nix b/configuration/linode.nix index 4224cfe..df1935f 100644 --- a/configuration/linode.nix +++ b/configuration/linode.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: { +{...}: { # Required for the lish console boot.kernelParams = ["console=ttyS0,19200n8"]; diff --git a/modules/default.nix b/modules/default.nix index 46f5e10..55e356c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,9 +1,8 @@ -{lib, ...}: -with lib; { - imports = [./virtualisation/pods.nix]; - - options.services.nginx.domain = mkOption { - type = types.str; +{lib, ...}: let + inherit (lib) mkOption types; +in { + options.services.nginx.domain = lib.mkOption { + type = lib.types.str; description = "The base domain name to append to virtual domain names"; }; }