From 5ee9dd8cf0bbf837f967f6c902b8fd3c427ff495 Mon Sep 17 00:00:00 2001 From: Caroline Larimore Date: Mon, 14 Apr 2025 14:54:40 -0700 Subject: migration: image webserver --- roles/web/default.nix | 1 - roles/web/images/default.nix | 26 ----------------- .../modules/nixos/services/web/images/default.nix | 34 ++++++++++++++++++++++ .../systems/x86_64-linux/copenhagen/default.nix | 1 + 4 files changed, 35 insertions(+), 27 deletions(-) delete mode 100644 roles/web/images/default.nix create mode 100644 snowfall/modules/nixos/services/web/images/default.nix diff --git a/roles/web/default.nix b/roles/web/default.nix index d15d682..d9fc202 100644 --- a/roles/web/default.nix +++ b/roles/web/default.nix @@ -2,7 +2,6 @@ { imports = [ - ./images ./personal ./stargazers ]; diff --git a/roles/web/images/default.nix b/roles/web/images/default.nix deleted file mode 100644 index cc95d9d..0000000 --- a/roles/web/images/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, lib, ... }: -with lib; - -let - cfg = config.roles.web.images; -in { - options.roles.web.images = { - enable = mkEnableOption "images site"; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = [ 80 443 ]; - - services.nginx = { - enable = true; - virtualHosts = { - "i.cxl.sh" = { - addSSL = true; - enableACME = true; - - root = "/srv/web/images"; - }; - }; - }; - }; -} diff --git a/snowfall/modules/nixos/services/web/images/default.nix b/snowfall/modules/nixos/services/web/images/default.nix new file mode 100644 index 0000000..b1c44e6 --- /dev/null +++ b/snowfall/modules/nixos/services/web/images/default.nix @@ -0,0 +1,34 @@ +{ options, config, lib, namespace, ... }: + +with lib; with lib.${namespace}; let + cfg = config.${namespace}.services.web.images; + impermanence = config.${namespace}.system.impermanence; +in { + options.${namespace}.services.web.images = with types; { + enable = mkEnableOption "image webserver"; + }; + + config = mkIf cfg.enable { + cxl.services.web.enable = true; + + environment.persistence.${impermanence.location} = { + directories = [ + "/srv/web/images" + ]; + }; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + services.nginx = { + enable = true; + virtualHosts = { + "i.cxl.sh" = { + addSSL = true; + enableACME = true; + + root = "/srv/web/images"; + }; + }; + }; + }; +} diff --git a/snowfall/systems/x86_64-linux/copenhagen/default.nix b/snowfall/systems/x86_64-linux/copenhagen/default.nix index ff0c0ed..20bfabb 100644 --- a/snowfall/systems/x86_64-linux/copenhagen/default.nix +++ b/snowfall/systems/x86_64-linux/copenhagen/default.nix @@ -18,6 +18,7 @@ with lib; with lib.${namespace}; { services = { web = { enable = true; + images.enable = true; } } }; -- cgit v1.2.3