feat: skynet 2016 is live!

applications/skynet.ie.nix

@@ -0,0 +1,55 @@
+{ config, pkgs, lib, inputs, ... }:
+  with lib;
+  let
+    cfg = config.services.skynet;
+  in {
+
+  imports = [
+    ./acme.nix
+    ./dns.nix
+  ];
+
+  options.services.skynet = {
+    host = {
+      ip = mkOption {
+        type = types.str;
+      };
+      name = mkOption {
+        type = types.str;
+      };
+    };
+  };
+
+  config = {
+    skynet_dns.records = [
+      # means root domain, so skynet.ie
+      {record="@"; r_type="A"; value=cfg.host.ip;}
+      {record="2016";  r_type="CNAME";  value="skynet.ie";}
+    ];
+
+    networking.firewall.allowedTCPPorts = [80 443];
+    services.httpd = {
+      enable = true;
+      group = "acme";
+
+      virtualHosts = {
+        # main site
+        "skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          documentRoot = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
+          # only on skynet.ie
+          # skynet.ie/~username
+          enableUserDir = true;
+        };
+
+        # archive of teh site as it was ~2012 to 2016
+        "2016.skynet.ie" = {
+          forceSSL = true;
+          useACMEHost = "skynet";
+          documentRoot = "${inputs.skynet_website_2016.defaultPackage."x86_64-linux"}";
+        };
+      };
+    };
+  };
+}

machines/skynet.nix

@@ -22,7 +22,7 @@ let
 
 in {
   imports = [
-    ../applications/acme.nix
+    ../applications/skynet.ie.nix
   ];
 
   deployment = {
@@ -35,13 +35,10 @@ in {
 
   # it has two network devices so two
   skynet_dns.records = [
-    {record=name;          r_type="A"; value=ip_pub;  server=true;}
+    #{record=name;          r_type="A"; value=ip_pub;  server=true;}
+    {record=name;          r_type="A"; value=ip_priv;  server=true;}
     {record="${name}.int"; r_type="A"; value=ip_priv; server=true;}
 
-    # change to pub later
-    {record="@"; r_type="A"; value=ip_priv;}
-
-    {record=ip_pub;  r_type="PTR"; value=hostname;}
     {record=ip_priv; r_type="PTR"; value=hostname_int;}
   ];
 
@@ -69,22 +66,10 @@ in {
     }
   ];
 
-  networking.firewall.allowedTCPPorts = [80 443];
+  services.skynet = {
-  services.httpd = {
+    host = {
-    enable = true;
+      ip = ip_priv;
-    group = "acme";
+      name = name;
-
-    virtualHosts = {
-        # main site
-        "skynet.ie" = {
-          forceSSL = true;
-          useACMEHost = "skynet";
-
-          documentRoot = "${inputs.skynet_website.defaultPackage."x86_64-linux"}";
-
-          # skynet.ie/~username
-          enableUserDir = true;
-        };
     };
   };
 }