diff options
| -rw-r--r-- | hosts/copenhagen/configuration.nix | 5 | ||||
| -rw-r--r-- | roles/web/default.nix | 7 | ||||
| -rw-r--r-- | snowfall/modules/nixos/services/web/personal/default.nix (renamed from roles/web/personal/default.nix) | 17 |
3 files changed, 10 insertions, 19 deletions
diff --git a/hosts/copenhagen/configuration.nix b/hosts/copenhagen/configuration.nix index 89dbbf4..f3f58bf 100644 --- a/hosts/copenhagen/configuration.nix +++ b/hosts/copenhagen/configuration.nix @@ -37,11 +37,6 @@ port = 25569; }; }; - web = { - images.enable = true; - stargazers.enable = true; - personal.enable = true; - }; }; programs = { diff --git a/roles/web/default.nix b/roles/web/default.nix deleted file mode 100644 index b1eb586..0000000 --- a/roles/web/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: - -{ - imports = [ - ./personal - ]; -} diff --git a/roles/web/personal/default.nix b/snowfall/modules/nixos/services/web/personal/default.nix index 8424b1d..6865830 100644 --- a/roles/web/personal/default.nix +++ b/snowfall/modules/nixos/services/web/personal/default.nix @@ -1,8 +1,9 @@ -{ config, pkgs, lib, ... }: -with lib; +{ options, config, lib, pkgs, namespace, ... }: + +with lib; with lib.${namespace}; let + cfg = config.${namespace}.services.web.personal; + impermanence = config.${namespace}.system.impermanence; -let - cfg = config.roles.web.personal; package = (pkgs.buildGoModule rec { pname = "site"; version = "6612d84c63a7bbc2a5b70607f2ec32ea070c4659"; @@ -23,11 +24,13 @@ let vendorHash = "sha256-2/4Wv7nsaT0wnUzkRgHKpSswigDj9nOvlmYXK29rvLU="; }); in { - options.roles.web.personal = { - enable = mkEnableOption "personal site"; + options.${namespace}.services.personal.images = with types; { + enable = mkEnableOption "personal site webserver"; }; config = mkIf cfg.enable { + cxl.services.web.enable = true; + networking.firewall.allowedTCPPorts = [ 80 443 ]; services.nginx = { @@ -47,7 +50,7 @@ in { }; }; - systemd.services."web.personal" = { + systemd.services."cxl.web.personal" = { enable = true; wantedBy = [ "multi-user.target" ]; |