3 files changed, 34 insertions, 20 deletions
diff --git a/hosts/by-name/server2/configuration.nix b/hosts/by-name/server2/configuration.nix
index ba0de14..65e3b24 100644
--- a/hosts/by-name/server2/configuration.nix
+++ b/hosts/by-name/server2/configuration.nix
@@ -16,13 +16,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;
@@ -83,7 +83,30 @@
     };
     redlib.enable = true;
     rust-motd.enable = true;
-    taskchampion-sync.enable = true;
+    sharkey = {
+      enable = true;
+      fqdn = "sharkey.vhack.eu";
+      settings = {
+        id = "aidx";
+
+        maxNoteLength = 8192;
+        maxFileSize = 1024 * 1024 * 1024;
+        proxyRemoteFiles = true;
+
+        # > At the suggestion of Sharkey maintainers,
+        # > this allows the server to run multiple workers
+        # > and without this (and postgres tuning), the instance runs slowly.
+        # Copied from: https://github.com/sodiboo/system/blob/b63c7b27f49043e8701b3ff5e1441cd27d5a2fff/sharkey.mod.nix#L21-L23
+        clusterLimit = 3;
+
+        signToActivityPubGet = true;
+        CheckActivityPubGetSigned = false;
+      };
+    };
+    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 7f5bce5..1736a32 100644
--- a/hosts/by-name/server3/configuration.nix
+++ b/hosts/by-name/server3/configuration.nix
@@ -21,6 +21,10 @@
       zones = import ../../../zones {inherit lib;};
     };
     fail2ban.enable = true;
+    grocy = {
+      enable = true;
+      domain = "grocy.vhack.eu";
+    };
     nix-sync = {
       enable = true;
       domains = import ./websites.nix {};
@@ -84,19 +88,7 @@
         verificationMode = "strict";
       };
       openFirewall = true;
-      principals = [
-        {
-          class = "individual";
-          name = "soispha";
-          secret = "$2b$05$XX36sJuHNbTFvi8DFldscOeQBHahluSkiUqD9QGzQaET7NJusSuQW";
-          email = [
-            "soispha@vhack.eu"
-            "abuse@vhack.eu"
-            "postmaster@vhack.eu"
-            "admin@vhack.eu"
-          ];
-        }
-      ];
+      principals = null;
     };
     postgresql.enable = true;
     rust-motd.enable = true;
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: