Konfiguration klarer nach Aspekten unterteilt

Insbesondere behandelt das Modul für die Website nur noch dieses spezifische Anliegen.

1 files changed, 7 insertions, 22 deletions

diff --git a/www/caddy.nix b/www/caddy.nix
index 8797204..6721316 100644
--- a/www/caddy.nix
+++ b/www/caddy.nix
@@ -8,27 +8,17 @@ let
     };
 in
 {
-  flake.domain = "heimfeld.hamburg";
   flake.machines.tharos = {
     nixos =
       { lib, ... }:
       {
-        networking.firewall.allowedTCPPorts = [
-          80
-          443
-        ];
-
-        services.caddy = {
-          enable = true;
-          email = "redaktion@${self.domain}";
-          virtualHosts.${self.domain} = {
-            serverAliases = [ "www.${self.domain}" ];
-            extraConfig = ''
-              file_server
-              root * /var/www/${self.domain}
-              encode gzip
-            '';
-          };
+        services.caddy.virtualHosts.${self.domain} = {
+          serverAliases = [ "www.${self.domain}" ];
+          extraConfig = ''
+            file_server
+            root * /var/www/${self.domain}
+            encode gzip
+          '';
         };
 
         systemd.tmpfiles.rules = [
@@ -45,16 +35,11 @@ in
         ...
       }:
       {
-        services.caddy.globalConfig = ''
-          local_certs
-        '';
         services.caddy.virtualHosts = {
           "http://www.localhost:${toString config.virtualisation.exposedPorts.http.port}".extraConfig =
             config.services.caddy.virtualHosts.${self.domain}.extraConfig;
         };
 
-        systemd.services.caddy.path = [ pkgs.nssTools ]; # Irrelevante Warnung unterdrücken
-
         services.getty.helpLine = lib.mkBefore ''
           ${self.domain}: http://www.localhost:${
             with config.virtualisation; toString (portOffset + exposedPorts.http.port)