change git server.

nixos/components/network/tinc/private.nix

@@ -136,6 +136,7 @@ in
         hosts.orbi
         "orbi"
         "95.216.66.212"
+        "git.ingolf-wagner.de"
       ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICTqV5ch4BokqDniDgCquRwfTz6aXXMTdZovIvqShfLV";
     };
@@ -145,7 +146,6 @@ in
         hosts.robi
         "robi"
         "144.76.13.147"
-        "git.ingolf-wagner.de"
         "taskd.ingolf-wagner.de"
       ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2PGX6cZuBUGX4VweMzi0aRh4uQ61yngCzZGcK3w5XV";

nixos/machines/chungus/rbackup.nix

@@ -8,16 +8,18 @@
       src = "root@orbi:/var/lib/nixos-containers/nextcloud";
       dst = "/mirror/nextcloud";
     };
+    git = {
+      sshKeyPath = config.sops.secrets.rsync_private_key.path;
+      src = "root@orbi:/var/lib/forgejo/";
+      dst = "/mirror/git";
+    };
+    # todo
     taskwarrior = {
       sshKeyPath = config.sops.secrets.rsync_private_key.path;
       src = "root@robi:/var/lib/taskserver/";
       dst = "/mirror/taskwarrior";
     };
-    gitea = {
-      sshKeyPath = config.sops.secrets.rsync_private_key.path;
-      src = "root@robi:/var/lib/gitea/";
-      dst = "/mirror/gitea";
-    };
+    # todo
     bitwarden = {
       sshKeyPath = config.sops.secrets.rsync_private_key.path;
       src = "root@robi:/var/lib/bitwarden_rs/";
@@ -28,7 +30,6 @@
       src = "root@orbi:/var/lib/nixos-containers/matrix-terranix";
       dst = "/mirror/matrix-terranix";
     };
-
     radarr = {
       sshKeyPath = config.sops.secrets.rsync_private_key.path;
       src = "root@orbi:/media/arr/radarr";
@@ -41,8 +42,6 @@
       dst = "/media/arr/sonarr";
       delete = false;
     };
-
-
   };
 
 

nixos/machines/orbi/configuration.nix

@@ -9,10 +9,12 @@
     ../../modules
 
 
-    # services
+    ./service-hedgedoc.nix
+    ./service-forgejo.nix
     #./borg.nix
     #./codimd.nix
     #./gitea.nix
+    #./packages.nix
     #./taskserver.nix
     #./vaultwarden.nix
 
@@ -30,14 +32,15 @@
     ./media-arr.nix
     ./media-nextcloud.nix
 
-    #./sync-opentracker.nix
-    #./sync-torrent.nix
-
     #./social-jitsi.nix
     ./social-matrix-terranix.nix
     #./social-matrix-ingolf-wagner.nix
 
-    # logging
+    #./sync-opentracker.nix
+    #./sync-torrent.nix
+
+    # telemetry
+    # ---------
     #./loki.nix
     #./loki-promtail.nix
     ##./prometheus.nix

nixos/machines/orbi/service-forgejo.nix

@@ -9,13 +9,13 @@
         forceSSL = true;
         enableACME = true;
         locations."/" = {
-          proxyPass = "http://localhost:${toString config.services.gogs.httpPort}";
+          proxyPass = "http://localhost:${toString config.services.forgejo.httpPort}";
         };
       };
     };
   };
 
-  services.gitea = {
+  services.forgejo = {
     enable = true;
     appName = "git.ingolf-wagner.de";
     #cookieSecure = true;

nixos/machines/robi/configuration.nix

@@ -10,8 +10,8 @@
     ./hetzner.nix
 
     ./borg.nix
-    ./codimd.nix
-    ./gitea.nix
+    #./codimd.nix
+    #./gitea.nix
     #./nextcloud.nix
     ./packages.nix
     ./taskserver.nix