Commit 110b6657f570

Vincent Demeester <vincent@sbr.pm>
2020-03-03 17:14:46
machines: migrate carthage to kerkouane
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent f0fee66
Changed files (2)
machine/carthage.nix
@@ -34,14 +34,6 @@ with import ../assets/machines.nix; {
           index = "index.html";
         };
       };
-      virtualHosts."sbr.pm" = {
-        enableACME = true;
-        forceSSL = true;
-        root = "/home/vincent/desktop/sites/sbr.pm";
-        locations."/" = {
-          index = "index.html";
-        };
-      };
     };
     openssh.ports = [ ssh.carthage.port ];
     openssh.permitRootLogin = "without-password";
@@ -54,7 +46,4 @@ with import ../assets/machines.nix; {
       endpointPublicKey = wireguard.kerkouane.publicKey;
     };
   };
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGR4dqXwHwPpYgyk6yl9+9LRL3qrBZp3ZWdyKaTiXp0p vincent@shikoku"
-  ];
 }
machine/kerkouane.nix
@@ -16,12 +16,34 @@ with import ../assets/machines.nix; {
     wireguard.server.enable = true;
   };
   networking.firewall.allowPing = true;
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  security = {
+    acme.certs = {
+      "sbr.pm".email = "vincent@sbr.pm";
+    };
+  };
   services = {
+    nginx = {
+      enable = true;
+      virtualHosts."kerkouane.sbr.pm" = {
+        enableACME = true;
+        forceSSL = true;
+        root = "/home/vincent/desktop/sites/kerkouane.sbr.pm";
+        locations."/" = {
+          index = "index.html";
+        };
+      };
+      virtualHosts."sbr.pm" = {
+        enableACME = true;
+        forceSSL = true;
+        root = "/home/vincent/desktop/sites/sbr.pm";
+        locations."/" = {
+          index = "index.html";
+        };
+      };
+    };
     openssh.ports = [ ssh.kerkouane.port ];
     openssh.permitRootLogin = "without-password";
     syncthing.guiAddress = "127.0.0.1:8384";
   };
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGR4dqXwHwPpYgyk6yl9+9LRL3qrBZp3ZWdyKaTiXp0p vincent@shikoku"
-  ];
 }