aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hosts/copenhagen/configuration.nix1
-rw-r--r--roles/web/default.nix1
-rw-r--r--roles/web/stargazers/default.nix24
-rw-r--r--snowfall/modules/nixos/services/web/stargazers/default.nix34
-rw-r--r--snowfall/systems/x86_64-linux/copenhagen/default.nix1
5 files changed, 35 insertions, 26 deletions
diff --git a/hosts/copenhagen/configuration.nix b/hosts/copenhagen/configuration.nix
index 99fd89f..89dbbf4 100644
--- a/hosts/copenhagen/configuration.nix
+++ b/hosts/copenhagen/configuration.nix
@@ -3,7 +3,6 @@
{
environment.persistence."/persist/system" = {
directories = [
- "/srv/web"
"/srv/minecraft"
];
};
diff --git a/roles/web/default.nix b/roles/web/default.nix
index d9fc202..b1eb586 100644
--- a/roles/web/default.nix
+++ b/roles/web/default.nix
@@ -3,6 +3,5 @@
{
imports = [
./personal
- ./stargazers
];
}
diff --git a/roles/web/stargazers/default.nix b/roles/web/stargazers/default.nix
deleted file mode 100644
index 23ea78d..0000000
--- a/roles/web/stargazers/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, lib, ... }:
-with lib;
-
-let cfg = config.roles.web.stargazers; in {
- options.roles.web.stargazers = {
- enable = mkEnableOption "stargazers webserver";
- };
-
- config = mkIf cfg.enable {
- networking.firewall.allowedTCPPorts = [ 80 443 ];
-
- services.nginx = {
- enable = true;
- virtualHosts = {
- "stargazers.xn--6frz82g" = {
- addSSL = true;
- enableACME = true;
-
- root = "/srv/web/stargazers";
- };
- };
- };
- };
-}
diff --git a/snowfall/modules/nixos/services/web/stargazers/default.nix b/snowfall/modules/nixos/services/web/stargazers/default.nix
new file mode 100644
index 0000000..3e9b46e
--- /dev/null
+++ b/snowfall/modules/nixos/services/web/stargazers/default.nix
@@ -0,0 +1,34 @@
+{ options, config, lib, namespace, ... }:
+
+with lib; with lib.${namespace}; let
+ cfg = config.${namespace}.services.web.stargazers;
+ impermanence = config.${namespace}.system.impermanence;
+in {
+ options.${namespace}.services.web.stargazers = with types; {
+ enable = mkEnableOption "stargazers webserver";
+ };
+
+ config = mkIf cfg.enable {
+ cxl.services.web.enable = true;
+
+ environment.persistence.${impermanence.location} = {
+ directories = [
+ "/srv/web/stargazers"
+ ];
+ };
+
+ networking.firewall.allowedTCPPorts = [ 80 443 ];
+
+ services.nginx = {
+ enable = true;
+ virtualHosts = {
+ "stargazers.xn--6frz82g" = {
+ addSSL = true;
+ enableACME = true;
+
+ root = "/srv/web/stargazers";
+ };
+ };
+ };
+ };
+}
diff --git a/snowfall/systems/x86_64-linux/copenhagen/default.nix b/snowfall/systems/x86_64-linux/copenhagen/default.nix
index 20bfabb..1a39924 100644
--- a/snowfall/systems/x86_64-linux/copenhagen/default.nix
+++ b/snowfall/systems/x86_64-linux/copenhagen/default.nix
@@ -19,6 +19,7 @@ with lib; with lib.${namespace}; {
web = {
enable = true;
images.enable = true;
+ stargazers.enable = true;
}
}
};