about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-11-22T17·28-0500
committerglittershark <grfn@gws.fyi>2020-11-22T22·55+0000
commit64ef09c47549457d0f2c808ad25c0d3c0efc9cd9 (patch)
tree4d581fb43040adda6b07529fdf912107f3be121e
parent9a24294b8a90c31cdb55f0cffeb406cadb7d3c07 (diff)
feat(whitby): Move wigglydonke.rs to whitby r/1907
Mugwump is too unstable for such an important internet service

Change-Id: Ic714200ce5ce51f366777f538b4a6f443f010960
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2124
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
-rw-r--r--ops/nixos/whitby/default.nix1
-rw-r--r--ops/nixos/www/wigglydonke.rs.nix15
-rw-r--r--users/glittershark/system/system/machines/mugwump.nix6
3 files changed, 16 insertions, 6 deletions
diff --git a/ops/nixos/whitby/default.nix b/ops/nixos/whitby/default.nix
index e12d6341d8..b9f0b48122 100644
--- a/ops/nixos/whitby/default.nix
+++ b/ops/nixos/whitby/default.nix
@@ -32,6 +32,7 @@ in lib.fix(self: {
     "${depot.depotPath}/ops/nixos/www/todo.tvl.fyi.nix"
     "${depot.depotPath}/ops/nixos/www/tvl.fyi.nix"
     "${depot.depotPath}/ops/nixos/www/b.tvl.fyi.nix"
+    "${depot.depotPath}/ops/nixos/www/wigglydonke.rs.nix"
     "${depot.third_party.nixpkgsSrc}/nixos/modules/services/web-apps/gerrit.nix"
   ];
 
diff --git a/ops/nixos/www/wigglydonke.rs.nix b/ops/nixos/www/wigglydonke.rs.nix
new file mode 100644
index 0000000000..0774eaea7c
--- /dev/null
+++ b/ops/nixos/www/wigglydonke.rs.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./base.nix
+  ];
+
+  config = {
+    services.nginx.virtualHosts."wigglydonke.rs" = {
+      enableACME = true;
+      forceSSL = true;
+      root = "${config.depot.depotPath}/users/glittershark/wigglydonke.rs";
+    };
+  };
+}
diff --git a/users/glittershark/system/system/machines/mugwump.nix b/users/glittershark/system/system/machines/mugwump.nix
index 7d930fc20a..64ee36ca72 100644
--- a/users/glittershark/system/system/machines/mugwump.nix
+++ b/users/glittershark/system/system/machines/mugwump.nix
@@ -111,12 +111,6 @@ with lib;
           proxyPass = "http://localhost:${toString config.services.grafana.port}";
         };
       };
-
-      "wigglydonke.rs" = {
-        enableACME = true;
-        forceSSL = true;
-        root = ../../../wigglydonke.rs;
-      };
     };
   };