nuc: switch to caddy

hosts/falkenstein/modules/dns/default.nix

@@ -35,8 +35,10 @@ let
 
     subdomains =
       let
-        getVirtualHosts = hostname: map (name: builtins.substring 0 (builtins.stringLength name - (builtins.stringLength domain + 1)) name) (builtins.attrNames self.nixosConfigurations."${hostname}".config.services.nginx.virtualHosts);
+        getVirtualHosts = hostname: map (name: builtins.substring 0 (builtins.stringLength name - (builtins.stringLength domain + 1)) name) (builtins.attrNames self.nixosConfigurations."${hostname}".config.services.caddy.virtualHosts);
+        getVirtualHostsNginx = hostname: map (name: builtins.substring 0 (builtins.stringLength name - (builtins.stringLength domain + 1)) name) (builtins.attrNames self.nixosConfigurations."${hostname}".config.services.nginx.virtualHosts);
         genCNAMEs = hostname: lib.attrsets.genAttrs (getVirtualHosts hostname) (label: { CNAME = [ "${hostname}.${domain}." ]; });
+        genCNAMEsNginx = hostname: lib.attrsets.genAttrs (getVirtualHostsNginx hostname) (label: { CNAME = [ "${hostname}.${domain}." ]; });
       in
       lib.attrsets.mergeAttrsList [
         rec {
@@ -54,7 +56,9 @@ let
 
         }
         (genCNAMEs "nuc")
+        (genCNAMEsNginx "nuc")
         (builtins.removeAttrs (genCNAMEs "falkenstein") [ "mail" ])
+        (builtins.removeAttrs (genCNAMEsNginx "falkenstein") [ "mail" ])
       ];
   });
 in

hosts/nuc/default.nix

@@ -8,7 +8,6 @@
       ./modules/networks
       ./modules/adguard
       ./modules/backup
-      # ./modules/keycloak
       ./modules/jellyfin
       ./modules/cache
       ./modules/matrix
@@ -16,7 +15,8 @@
       ./modules/seafile
       ./modules/torrent
       ./modules/vaultwarden
-      ./modules/nginx
+      # ./modules/nginx
+      ./modules/caddy
       ./modules/indexing
     ];
 

hosts/nuc/modules/authentik/default.nix

@@ -9,10 +9,13 @@ in
   services.authentik = {
     enable = true;
     environmentFile = config.age.secrets.authentik.path;
-    nginx = {
+    # nginx = {
-      enable = true;
+    #   enable = true;
-      enableACME = true;
+    #   enableACME = true;
-      host = domain;
+    #   host = domain;
-    };
+    # };
   };
+  services.caddy.virtualHosts."${domain}".extraConfig = ''
+    reverse_proxy localhost:9000
+  '';
 }

hosts/nuc/modules/cache/default.nix

@@ -10,9 +10,7 @@ in
     enable = true;
     secretKeyFile = config.age.secrets.cache.path;
   };
-  services.nginx.virtualHosts."${domain}" = {
+  services.caddy.virtualHosts."${domain}".extraConfig = ''
-    locations."/" = {
+    reverse_proxy 127.0.0.1:${toString config.services.nix-serve.port}
-      proxyPass = "http://127.0.0.1:${toString config.services.nix-serve.port}";
+  '';
-    };
-  };
 }

hosts/nuc/modules/caddy/default.nix

@@ -0,0 +1,10 @@
+{ config, ... }:
+{
+  services.caddy = {
+    enable = true;
+    email = "ca@${config.networking.domain}";
+    logFormat = "format console";
+  };
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  networking.firewall.allowedUDPPorts = [ 443 ];
+}

hosts/nuc/modules/keycloak/default.nix

@@ -1,43 +0,0 @@
-{ config, ... }:
-let
-  domain = "auth.${config.networking.domain}";
-in
-{
-  age.secrets.keycloak = {
-    file = ../../../../secrets/nuc/keycloak/db.age;
-  };
-  services.keycloak = {
-    enable = true;
-    settings = {
-      http-port = 8084;
-      https-port = 19000;
-      hostname = domain;
-      # proxy-headers = "forwarded";
-      proxy = "edge";
-    };
-    database = {
-      # host = "/var/run/postgresql/.s.PGSQL.5432";
-      # useSSL = false;
-      # createLocally = false;
-      passwordFile = config.age.secrets.keycloak.path;
-    };
-    initialAdminPassword = "plschangeme";
-  };
-  # services.postgresql = {
-  #   enable = true;
-  #   ensureUsers = [
-  #     {
-  #       name = "keycloak";
-  #       ensureDBOwnership = true;
-  #     }
-  #   ];
-  #   ensureDatabases = [ "keycloak" ];
-  # };
-  services.nginx.virtualHosts."${domain}" = {
-    enableACME = true;
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "http://127.0.0.1:${toString config.services.keycloak.settings.http-port}";
-    };
-  };
-}

hosts/nuc/modules/matrix/default.nix

@@ -32,6 +32,7 @@ in
     matrix-synapse = {
       enable = true;
       configureRedisLocally = true;
+      enableRegistrationScript = false;
       extraConfigFiles = [ config.age.secrets."matrix/shared".path ];
       log = {
         root.level = "WARNING";
@@ -41,10 +42,9 @@ in
         server_name = config.networking.domain;
 
         listeners = [{
-          port = 8008;
+          path = "/run/matrix-synapse/server.sock";
-          bind_addresses = [ "::1" ];
+          mode = "666";
           type = "http";
-          tls = false;
           x_forwarded = true;
           resources = [{
             names = [ "client" "federation" ];
@@ -57,29 +57,24 @@ in
       enable = true;
       settings = {
         SYNCV3_SERVER = "https://${domain}";
+        SYNCV3_BINDADDR = "/run/matrix-sliding-sync/server.sock";
       };
       environmentFile = config.age.secrets."matrix/sync".path;
     };
 
 
-    nginx = {
+    caddy = {
-      recommendedProxySettings = true;
       virtualHosts = {
         # synapse
-        "${domain}" = {
+        "${domain}".extraConfig = ''
-          # locations."/".extraConfig = "return 404;";
+          reverse_proxy /client/* unix//run/matrix-sliding-sync/server.sock
-
+          reverse_proxy /_matrix/client/unstable/org.matrix.msc3575/sync* unix//run/matrix-sliding-sync/server.sock
-          # # proxy to synapse
+          reverse_proxy unix//run/matrix-synapse/server.sock
-          # locations."/_matrix".proxyPass = "http://[::1]:8008";
+        '';
-          locations."/".proxyPass = "http://[::1]:8008";
-          locations."~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)".proxyPass = "http://localhost:8009";
-          # locations."/_synapse/client".proxyPass = "http://[::1]:8008";
-        };
-
 
         # element
-        "${domainClient}" = {
+        "${domainClient}".extraConfig = ''
-          root = pkgs.element-web.override {
+          root '${pkgs.element-web.override {
             conf = {
               default_server_config = {
                 inherit (clientConfig) "m.homeserver";
@@ -87,13 +82,23 @@ in
               };
               disable_3pid_login = true;
             };
-          };
+          }}'
-        };
+        '';
       };
     };
   };
 
-  systemd.services.matrix-synapse.after = [ "matrix-synapse-pgsetup.service" ];
+  systemd.services.matrix-synapse = {
+    after = [ "matrix-synapse-pgsetup.service" ];
+    serviceConfig = {
+      RuntimeDirectory = "matrix-synapse";
+    };
+  };
+  systemd.services.matrix-sliding-sync = {
+    serviceConfig = {
+      RuntimeDirectory = "matrix-sliding-sync";
+    };
+  };
 
   systemd.services.matrix-synapse-pgsetup = {
     description = "Prepare Synapse postgres database";

hosts/nuc/modules/seafile/default.nix

@@ -31,21 +31,16 @@ in
       }
     '';
   };
-  services.nginx.virtualHosts."${domain}" = {
+  services.caddy.virtualHosts."${domain}".extraConfig = ''
-    locations."/" = {
+    redir /accounts/login /oauth/login
-      proxyPass = "http://unix:/run/seahub/gunicorn.sock";
+    reverse_proxy unix//run/seahub/gunicorn.sock
-    };
+    route /media/* {
-    locations."/seafhttp" = {
+      root '${pkgs.seahub}'
-      proxyPass = "http://127.0.0.1:${toString config.services.seafile.seafileSettings.fileserver.port}";
+    }
-      extraConfig = ''
+
-        rewrite ^/seafhttp(.*)$ $1 break;
+    route /seafhttp/* {
+      uri strip_prefix /seafhttp
+      reverse_proxy 127.0.0.1:${toString config.services.seafile.seafileSettings.fileserver.port}
+    }
   '';
-    };
-    locations."/media" = {
-      root = pkgs.seahub;
-    };
-    locations."/accounts/login" = {
-      return = "301 /oauth/login";
-    };
-  };
 }

hosts/nuc/modules/vaultwarden/default.nix

@@ -29,9 +29,7 @@ in
     ];
     ensureDatabases = [ "vaultwarden" ];
   };
-  services.nginx.virtualHosts."${domain}" = {
+  services.caddy.virtualHosts."${domain}".extraConfig = ''
-    locations."/" = {
+    reverse_proxy 127.0.0.1:${toString config.services.vaultwarden.config.rocketPort}
-      proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.rocketPort}";
+  '';
-    };
-  };
 }

shared/zsh.nix

@@ -9,6 +9,7 @@
     trash-cli
     nix-output-monitor
     iperf
+    jq
   ];
   users.defaultUserShell = pkgs.zsh;
   programs.fzf = {