5 files changed, 35 insertions, 16 deletions
diff --git a/hosts/by-name/server2/configuration.nix b/hosts/by-name/server2/configuration.nix
index 24513f4..5b85e69 100644
--- a/hosts/by-name/server2/configuration.nix
+++ b/hosts/by-name/server2/configuration.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   imports = [
     ./networking.nix # network configuration that just works
     ./hardware.nix
@@ -16,13 +12,13 @@
   };
 
   vhack = {
-    back = {
+    atuin-sync = {
+      enable = true;
+      fqdn = "atuin-sync.vhack.eu";
+    };
+    git-back = {
       enable = true;
       domain = "issues.foss-syndicate.org";
-      settings = {
-        scan_path = "${config.services.gitolite.dataDir}/repositories";
-        project_list = "${config.services.gitolite.dataDir}/projects.list";
-      };
     };
     backup = {
       enable = true;
@@ -103,7 +99,10 @@
         CheckActivityPubGetSigned = false;
       };
     };
-    taskchampion-sync.enable = true;
+    taskchampion-sync = {
+      enable = true;
+      fqdn = "taskchampion.vhack.eu";
+    };
     users.enable = true;
   };
 
diff --git a/hosts/by-name/server3/configuration.nix b/hosts/by-name/server3/configuration.nix
index 6966e58..a7cdc1d 100644
--- a/hosts/by-name/server3/configuration.nix
+++ b/hosts/by-name/server3/configuration.nix
@@ -21,6 +21,11 @@
       zones = import ../../../zones {inherit lib;};
     };
     fail2ban.enable = true;
+    rocie = {
+      enable = true;
+      domain = "rocie.vhack.eu";
+      loginSecret = ./secrets/rocie/login.age;
+    };
     nix-sync = {
       enable = true;
       domains = import ./websites.nix {};
diff --git a/hosts/by-name/server3/secrets/rocie/login.age b/hosts/by-name/server3/secrets/rocie/login.age
new file mode 100644
index 0000000..0a6b8d3
--- /dev/null
+++ b/hosts/by-name/server3/secrets/rocie/login.age
@@ -0,0 +1,16 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWN3ZFdjMyNjBvQXQ1YVYz
+OTBHMWYvbk5xK1ArVDYvMmZEUFF5dHRSajFNCkFXSCtPV2VVdW50amVVMVYxYXBK
+SHd4bXRXSEw0ZnJ3TTMvbmZGTStFbEUKLT4gWDI1NTE5IDZYMFJKWVBPVmc5QmFK
+M0xGNGNJZHNnRWxBcytaZXU3VWlqMzQvdDdhbm8KcVlIZTlRYVBZNEx1djZJbURD
+Qy9NUTEwYVN0VjhZbkc3TTNuUWd0QTFjcwotPiBzc2gtZWQyNTUxOSBweXU5Ymcg
+SnZ0czg2OUszeFJIbmNpU2RDV2tnMVRlUUVvMk5BTWcwbFFibDVzQXZUbwpJbkVC
+bFFqYzJZQTFQWDM4Zk42ZzE4Q2kzQlh4aTRtMHUyRlgrWlc1WUtjCi0+IFFELWdy
+ZWFzZQpCMDVUczNTa01KS2hFREhpM0k5L3ZHT0NDUEtVck1iZE13cnVkSi9Kdk80
+WXU1M3A0V1pZbGxZaVNGanZRUnE4CmYwUlo4QlVFTjc4YlFaQjZyU3BybTAwaTVP
+WHc2K1FyYzduT0RBYWtEa0xSREEKLS0tIExFSThrd2xGT3lEU1p6VXE0eWpZUG5z
+ZlVXMWJFS0NxczhycXl1VWc1bmsK4Dq740IgQP9CnGtkUrwWxM4QUOnQTgWe1YbI
+LtC471ykB4YlPIbMiqUdnBuFZQ9cBAOT2YuicxbI+/2Rb/mSRV0l8dGKpc2fqOVy
+zLLcX8A48NfmcbPeUtlv/HnVfu6Fe7X91V0bw6eMjWSvvcpQXsaIAd7TEPTpexCs
+gfAWd+brZMq6VzwslklxO4S5ZIu0jUSz4q6covAuxfEW3hdSbIg=
+-----END AGE ENCRYPTED FILE-----
diff --git a/hosts/by-name/server3/websites.nix b/hosts/by-name/server3/websites.nix
index 466f1e9..ece6247 100644
--- a/hosts/by-name/server3/websites.nix
+++ b/hosts/by-name/server3/websites.nix
@@ -1,7 +1,7 @@
 {...}: let
   mkWkd = domain: {
     domain = "openpgpkey.${domain}";
-    repositoryUrl = "https://git.foss-syndicate.org/vhack.eu/pgp-wkd.git";
+    repositoryUrl = "https://git.foss-syndicate.org/vhack.eu/pgp-wkd";
     extraSettings = {
       locations."/.well-known/openpgpkey/".extraConfig = ''
         default_type application/octet-stream;
@@ -15,17 +15,17 @@
 in [
   {
     domain = "vhack.eu";
-    repositoryUrl = "https://codeberg.org/vhack.eu/website.git";
+    repositoryUrl = "https://codeberg.org/vhack.eu/website";
   }
   {
     domain = "b-peetz.de";
-    repositoryUrl = "https://git.foss-syndicate.org/bpeetz/b-peetz.de.git";
+    repositoryUrl = "https://git.foss-syndicate.org/bpeetz/b-peetz.de";
   }
 
   # Trinitrix
   {
     domain = "trinitrix.vhack.eu";
-    repositoryUrl = "https://codeberg.org/trinitrix/website.git";
+    repositoryUrl = "https://codeberg.org/trinitrix/website";
   }
 
   # WKD
diff --git a/hosts/default.nix b/hosts/default.nix
index f53ee35..664c376 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -12,7 +12,6 @@
     useShards = false;
     baseDirectory = ./by-name;
     fileName = "configuration.nix";
-    finalizeFunction = name: value: value;
   };
 
   mkNixosConfiguration = _: value: