Allow catacomb to ssh into gitea for dump backups

This should deprecate the need for using the python venv, as long as you su to the user as a login shell

amanuensis.nix

@@ -19,8 +19,9 @@ in
 
   # Create the server process systemd unit
   systemd.services.amanuensis = {
-    enable = false;
+    enable = true;
     description = "Amanuensis Lexicon server";
+    path = [ python3-with-amanuensis-requires ];
     serviceConfig = {
       Type = "simple";
       ExecStart = "/home/amanuensis/Amanuensis/run.sh";

catacomb.nix

@@ -10,10 +10,24 @@
     extraConfig = ''
       access_log /var/log/nginx/access.catacomb.log;
     '';
-    locations."/".extraConfig = ''
+    locations = {
+      # Forwards to the index server
+      "/browse/".proxyPass = "http://10.7.3.16:7472/browse/";
+      # Forwards to nginx via catacomb auth server
+      "/".extraConfig = ''
+        auth_request /auth;
         proxy_buffering off;
-      proxy_pass http://10.7.3.16:7473/;
+        proxy_pass http://10.7.3.16:7470/;
       '';
+      "= /auth".extraConfig = ''
+        internal;
+        proxy_buffering off;
+        proxy_pass_request_body off;
+        proxy_pass http://10.7.3.16:7471/;
+        proxy_set_header Content-Length "";
+        proxy_set_header X-Original-URI $request_uri;
+      '';
+    };
   };
 }
 

gitea.nix

@@ -48,6 +48,10 @@
     };
   };
 
+  users.users.gitea.openssh.authorizedKeys.keys = [
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCYr3Y4waQA4Qb9Vv29APxqkAE6E8KSoTcK1L+NSKOEAb3IxlqitMMnDFfWENXuQlEkkxkqszGA3oe2uchN89UckBFIkm8oEBNE2ZQ0SnuVv+ETHRYMmGvhfOnsnEzpD/j6qSk/0/ea2eJpzfUazMVNTDP7aX6pI0F0n6lXFty0vVan/gN6lM41aNatlQPGxY2XDJQ/e2IJJeOubb2YwH/Vj7/t25yuKiQ5AmaX9fVheM4xA1xfNTs42UfoHzU7Pk3gT6D6L1DGHjsbO0FD4lKPe030XYcPVvpqSiEKGTAYvcWnPH/RDXuz6cEQpN3kMajEtvKUcu0FM/3NPJhvUuxEX0wJnvPPRuY30tcD2WuYemQjm5OCGewdIr1a7mMJ/5zEAzRq4AttEdw7PtTjoj8O+0S6pFrFnv6Dp5TOrg9jyRLICEv7SPb76OhPWWr2uf3TllfXJcQMdsEd3gnTxaUUgJRmD3hfAQO5fOR0MFuVw+bVgleeYctBCW5UjbWZqE1lzEU8xwVYKB05HnWI5tgeh/pkdjg9AfdWnuVU7EljJ8nFEevNTJEe3kjZ67l+wL/dLiyyQuMIq1oBpcOCq+ew0jWZMfPq3o5r13qsdPkUuqdwWOXhCQtqOHHYXVgFEvEGLWacdgHSIFlP7IdfW1M4k1yFPBUlJUU9Bo+VGSZxSw== tvb@catacomb"
+  ];
+
   # Configure nginx to forward to the server at the git subdomain
   services.nginx.virtualHosts."git.alogoulogoi.com" = {
     enableACME = true;