Merge branch 'main' of https://gitlab.skynet.ie/compsoc1/skynet/nixos

applications/bitwarden/vaultwarden.nix

@@ -47,11 +47,18 @@ in {
       }
     ];
 
-    services.nginx.virtualHosts."${domain}" = {
+    services.nginx.virtualHosts = {
-      forceSSL = true;
+      "${cfg.host.ip}" = {
-      useACMEHost = "skynet";
+        forceSSL = true;
-      locations."/" = {
+        useACMEHost = "skynet";
-        proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}";
+        locations."/".return = "307 https://skynet.ie";
+      };
+      "${domain}" = {
+        forceSSL = true;
+        useACMEHost = "skynet";
+        locations."/" = {
+          proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}";
+        };
       };
     };
 

applications/email.nix

@@ -245,6 +245,12 @@ in {
 
     # to provide the certs
     services.nginx.virtualHosts = {
+      "${cfg.host.ip}" = {
+        forceSSL = true;
+        useACMEHost = "skynet";
+        locations."/".return = "307 https://skynet.ie";
+      };
+
       "mail.skynet.ie" = {
         forceSSL = true;
         useACMEHost = "mail";

applications/games.nix

@@ -60,6 +60,12 @@ in {
     ];
 
     services.nginx.virtualHosts = {
+      "${cfg.host.ip}" = {
+        forceSSL = true;
+        useACMEHost = "skynet";
+        locations."/".return = "307 https://skynet.ie";
+      };
+
       "${cfg.domain.sub}.skynet.ie" = {
         forceSSL = true;
         useACMEHost = "skynet";

applications/games/minecraft.nix

@@ -108,6 +108,12 @@ in {
     ];
 
     services.nginx.virtualHosts = {
+      "${cfg.host.ip}" = {
+        forceSSL = true;
+        useACMEHost = "skynet";
+        locations."/".return = "307 https://skynet.ie";
+      };
+
       # https://config.minecraft.games.skynet.ie
       "config.${short_domain}" = {
         forceSSL = true;

applications/gitlab.nix

@@ -150,6 +150,12 @@ in {
     services.openssh.ports = [22 2222];
 
     services.nginx.virtualHosts = {
+      "${cfg.host.ip}" = {
+        forceSSL = true;
+        useACMEHost = "skynet";
+        locations."/".return = "307 https://skynet.ie";
+      };
+
       # main site
       "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
         forceSSL = true;

applications/nextcloud.nix

@@ -108,6 +108,11 @@ in {
     };
 
     services.nginx.virtualHosts = {
+      "${cfg.host.ip}" = {
+        forceSSL = true;
+        useACMEHost = "skynet";
+        locations."/".return = "307 https://skynet.ie";
+      };
       ${domain} = {
         forceSSL = true;
         useACMEHost = "skynet";

applications/skynet_users.nix

@@ -68,6 +68,12 @@ in {
     systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
 
     services.nginx.virtualHosts = {
+      "${cfg.host.ip}" = {
+        forceSSL = true;
+        useACMEHost = "skynet";
+        locations."/".return = "307 https://skynet.ie";
+      };
+
       # main site
       "*.users.skynet.ie" = {
         forceSSL = true;

applications/ulfm.nix

@@ -93,10 +93,22 @@ in {
       };
     };
 
-    services.nginx.virtualHosts."${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
+    services.nginx = {
-      forceSSL = true;
+      enable = true;
-      useACMEHost = "skynet";
+      group = "acme";
-      locations."/".proxyPass = "http://localhost:8000";
+
+      virtualHosts = {
+        "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          locations."/".proxyPass = "http://localhost:8000";
+        };
+        "${cfg.host.ip}" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          locations."/".return = "307 https://skynet.ie";
+        };
+      };
     };
   };
 }

flake.lock

@@ -107,11 +107,11 @@
       },
       "locked": {
         "host": "gitlab.skynet.ie",
-        "lastModified": 1698519699,
+        "lastModified": 1706893483,
-        "narHash": "sha256-GK8NGWeG2gf3z/ktT0rzDVfj1UsaXxDLcSWCz6tsYSY=",
+        "narHash": "sha256-x9OWItfCPTQA9klaN2gpaNLdqUVS0beUMdxbjmc7WgE=",
         "owner": "compsoc1%2Fcompsoc",
         "repo": "presentations%2Fpresentations",
-        "rev": "7f451b04c5cffda1558e58f65a53dbc89a678446",
+        "rev": "54d1fd58213e087d63331a0d94ea723617207e20",
         "type": "gitlab"
       },
       "original": {