Add usatour machine

.github/workflows/deploy.yml

@@ -49,6 +49,7 @@ jobs:
           - "bioma.l"
           - "ps.l"
           - "feriusa.l"
+          - "usatour.l"
       fail-fast: false
     needs: bastion
 

flake.nix

@@ -61,6 +61,9 @@
       "feriusa.l" = mkSystem "feriusa.l" [
         feriusa.nixosModules.wordpress
       ];
+      "usatour.l" = mkSystem "usatour.l" [
+        feriusa.nixosModules.wordpress
+      ];
       "sso-test.l" = mkSystem "sso-test.l" [
         {nixpkgs.overlays = [sso-test-overlay];}
         sso-test.nixosModules.service

infra/infra.nix

@@ -159,6 +159,11 @@
           backing = "minimal-base-v3";
           capacity = unit.GiB 8;
         }
+        {
+          name = "usatour";
+          backing = "minimal-base-v3";
+          capacity = unit.GiB 8;
+        }
       ];
     };
   };
@@ -190,7 +195,6 @@
           {mac = "02:a2:cd:0c:46:78"; hostname = "spum-platform";    address = "10.17.3.110";}
           {mac = "02:b2:a8:b4:1a:fd"; hostname = "ps-old";           address = "10.17.3.130";}
           {mac = "02:2a:89:07:ca:ef"; hostname = "gtpmas.l";         address = "10.17.3.173";}
-          {mac = "02:94:78:76:bd:6b"; hostname = "prometheus-old.l"; address = "10.17.3.107";}
         ];
       };
     };
@@ -451,6 +455,26 @@
         }
       ];
     };
+    "usatour" = {
+      start = true;
+      autoStart = true;
+      memory = unit.GiB 1;
+      vcpu = 1;
+      disks = [
+        {
+          device = "vda";
+          pool = "alternative";
+          volume = "usatour";
+        }
+      ];
+      networkInterfaces = [
+        {
+          network = "private-network";
+          hostname = "usatour.l";
+          address = "10.17.3.152";
+        }
+      ];
+    };
     "student-mqtt" = {
       start = true;
       autoStart = true;

machines/gateway.l/configuration.nix

@@ -88,6 +88,9 @@
       "feriusa.um.si" = {
         inherit email;
       };
+      "students.lpm.feri.um.si" = {
+        inherit email;
+      };
     };
     security.acme.acceptTerms = true;
 
@@ -254,6 +257,15 @@
           proxyPass = "http://feriusa.l/";
         };
       };
+      "students.lpm.feri.um.si" = {
+        addSSL = true;
+        enableACME = true;
+
+        locations."/" = {
+          recommendedProxySettings = true;
+          proxyPass = "http://usatour.l/";
+        };
+      };
       "dev.login.lpm.feri.um.si" = {
         addSSL = true;
         enableACME = true;

machines/usatour/configuration.nix → machines/usatour.l/configuration.nix

@@ -3,10 +3,10 @@
 {
   imports = [
     ../../modules/image.nix
-    ../../modules/base.nix
     ../../users/root.nix
+    ../../users/usatour.nix
     ../../users/rescue.nix
   ];
 
-  networking.firewall.allowedTCPPorts = [22 80 9100];
+  networking.firewall.allowedTCPPorts = [22 80];
 }

users/feriusa.nix

@@ -2,7 +2,7 @@
 {
   users.users.feriusa = {
     isNormalUser = true;
-    description = "Feri USA user";
+    description = "FERI USA user";
     openssh.authorizedKeys.keys = with import ../ssh/users.nix; [mario ziga matej marko cvetanka];
   };
 }

users/usatour.nix

@@ -0,0 +1,8 @@
+{config, lib, ...}:
+{
+  users.users.usatour = {
+    isNormalUser = true;
+    description = "Legacy FERI USA user";
+    openssh.authorizedKeys.keys = with import ../ssh/users.nix; [mario ziga matej marko cvetanka];
+  };
+}