hosts/suwako: move gitea from marisa to suwako

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

hosts/marisa/services/default.nix

@@ -3,14 +3,11 @@
 
   imports = [
     # ./hashicorp.nix
-    ./gitea.nix
   ];
 
-  # Add secrets to nomad, consul and vault
   virtualisation.docker = {
     enable = true;
     daemon.settings = {
-      #     default-cgroupns-mode = "host";
     };
   };
   services = {
@@ -21,15 +18,5 @@
         22001
       ];
     };
-    postgresql = {
-      enable = true;
-      authentication = ''
-        local gitea all ident map=gitea-map
-      '';
-      identMap = ''
-        gitea-map gitea gitea
-      '';
-    };
-
   };
 }

hosts/remilia/networking.nix

@@ -25,7 +25,8 @@
             22001
             22002
             4444
-          ] ++ (map (x: x.sourcePort) config.networking.nat.forwardPorts);
+          ]
+          ++ (map (x: x.sourcePort) config.networking.nat.forwardPorts);
           allowedUDPPorts = [ 17840 ];
         };
       };

hosts/remilia/services.nix

@@ -45,12 +45,11 @@ in
               forceSSL = ssl;
               locations."/" = {
                 proxyPass = toString addr;
-                extraConfig =
+                extraConfig = ''
-                  ''
+                  expires $expires;
-                    expires $expires;
+                  proxy_set_header Host $host;
-                    proxy_set_header Host $host;
+                ''
-                  ''
+                + conf;
-                  + conf;
               };
             };
         in
@@ -65,10 +64,11 @@ in
             };
             serverAliases = [ "www.${domain}" ];
           };
-          # "vault.${domain}" = genericHttpRProxy { addr = "https://${marisa}:8800"; };
+
-          # "consul.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8500"; };
+          # MPD server
-          "f.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8000"; };
           "radio.${domain}" = genericHttpRProxy { addr = "http://${satori}:8001"; };
+
+          # Some random music server I once had
           /*
             "radio.${domain}" = {
             addSSL = true;
@@ -84,10 +84,24 @@ in
             };
           */
 
-          "git.${domain}" = genericHttpRProxy {
+          # Gitea
-            addr = "http://${marisa}:5001";
+          /*
-            conf = "client_max_body_size 64M;";
+            "git.${domain}" = genericHttpRProxy {
-          };
+              addr = "http://${marisa}:5001";
+              conf = "client_max_body_size 64M;";
+            };
+          */
+
+          # Personal filehost
+          # "f.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8000"; };
+
+          # Hashicorp Vault
+          # "vault.${domain}" = genericHttpRProxy { addr = "https://${marisa}:8800"; };
+
+          # Hashicorp Consul
+          # "consul.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8500"; };
+
+          # Hashicorp Nomad
           /*
             "nomad.${domain}" = genericHttpRProxy {
             addr = "http://${marisa}:4646";

hosts/suwako/services/default.nix

@@ -4,6 +4,7 @@
     ./nginx.nix
     ./pufferpanel.nix
     ./filehost.nix
+    ./gitea.nix
   ];
 
   virtualisation.docker = {
@@ -18,5 +19,15 @@
       settings.PermitRootLogin = "yes";
       ports = [ 22 ];
     };
+
+    postgresql = {
+      enable = true;
+      authentication = ''
+        local gitea all ident map=gitea-map
+      '';
+      identMap = ''
+        gitea-map gitea gitea
+      '';
+    };
   };
 }

hosts/suwako/services/gitea.nix

@@ -25,15 +25,14 @@
             HTTP_PORT = 5001;
             ROOT_URL = "https://git.${domain}";
             SSH_DOMAIN = "git.${domain}";
-            SSH_PORT = 22001;
+            SSH_PORT = 22;
             SSH_LISTEN_PORT = SSH_PORT;
           };
           mailer = rec {
             ENABLED = true;
             FROM = "masti@${domain}";
-            TYPE = "smtp";
+            SMTP_ADDR = "mail.${domain}";
-            HOST = "mail.${domain}";
+            PROTOCOL = "smtps";
-            IS_TLS_ENABLED = true;
             USER = FROM;
             REGISTER_MAIL_CONFIRM = true;
           };

hosts/suwako/services/nginx.nix

@@ -52,6 +52,12 @@ in
           '';
         };
 
+        # Gitea
+        "git.${domain}" = genericHttpRProxy {
+          addr = "http://${suwako}:5001";
+          conf = "client_max_body_size 64M;";
+        };
+
         # Personal filehost
         "f.${domain}" = genericHttpRProxy { addr = "http://${suwako}:8000"; };
       };