services -> less folders where possible

config/hosts/daiyousei.nix

@@ -4,10 +4,10 @@
     profiles.hardware.oracle.ubuntu
     profiles.network
     services.nginx
+    services.filehost
     services.keycloak
     services.vikunja
     services.tt-rss
-    services.roundcube
     services.openldap
     services.mail
     services.hedgedoc

config/hosts/kyouko.nix

@@ -10,16 +10,13 @@ with lib;
     profiles.network
     users.kat.server
     users.kat.services.weechat
-    services.filehost
     services.gitea
     services.logrotate
-#    services.nixos-mailserver
-    services.matrix
+    services.synapse
     services.murmur
     services.nginx
     services.postgres
     services.prosody
-#    services.radicale
     services.restic
     services.syncplay
     services.taskserver

config/services/filehost/default.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.nginx.virtualHosts = {
-    "files.${config.network.dns.domain}" = {
-      root = "/var/www/files";
-      enableACME = true;
-      forceSSL = true;
-    };
-  };
-
-  deploy.tf.dns.records.services_filehost = {
-    inherit (config.network.dns) zone;
-    domain = "files";
-    cname = { inherit (config.network.addresses.public) target; };
-  };
-}

config/services/mail/default.nix

@@ -6,5 +6,6 @@
     ./dovecot.nix
     ./opendkim.nix
     ./autoconfig.nix
+    ./roundcube.nix
   ];
 }

config/services/radicale/default.nix

@@ -1,43 +0,0 @@
-{ config, pkgs, lib, tf, ... }:
-
-with lib;
-
-{
-  secrets.files.radicale_htpasswd = {
-    text = ''
-      kat@kittywit.ch:${tf.variables.mail-kat-hash.ref}
-    '';
-  };
-
-  services.radicale = {
-    enable = true;
-    settings = {
-      auth = {
-        type = "htpasswd";
-        htpasswd_filename = config.secrets.files.radicale_htpasswd.path;
-        htpasswd_encryption = "bcrypt";
-      };
-    };
-  };
-
-  services.nginx.virtualHosts = {
-    "cal.${config.network.dns.domain}" = {
-      forceSSL = true;
-      enableACME = true;
-      locations."/" = {
-        proxyPass = "http://localhost:5232/";
-        extraConfig = ''
-          proxy_set_header  X-Script-Name /;
-          proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_pass_header Authorization;
-        '';
-      };
-    };
-  };
-
-  deploy.tf.dns.records.services_radicale = {
-    inherit (config.network.dns) zone;
-    domain = "cal";
-    cname = { inherit (config.network.addresses.public) target; };
-  };
-}