7 files changed, 9 insertions, 82 deletions

diff --git a/ext/terranix/cloudflare/dns.nix b/ext/terranix/cloudflare/dns.nix
index 81e6d0d..f750e5f 100644
--- a/ext/terranix/cloudflare/dns.nix
+++ b/ext/terranix/cloudflare/dns.nix
@@ -12,12 +12,10 @@
     // lib.optionalAttrs (type != "TXT") {proxied = true;};
 
   zones = {
-    mydadleft_me = lib.tfRef "var.mydadleft_me_zone_id";
     getchoo_com = lib.tfRef "var.getchoo_com_zone_id";
   };
   inherit
     (zones)
-    mydadleft_me
     getchoo_com
     ;
 
@@ -50,10 +48,6 @@
   };
 in {
   resource.cloudflare_zone_dnssec = {
-    mydadleft_me_dnssec = {
-      zone_id = mydadleft_me;
-    };
-
     getchoo_com_dnssec = {
       zone_id = getchoo_com;
     };
@@ -96,41 +90,6 @@ in {
         zone_id = getchoo_com;
       };
 
-      mydadleft_me_website = {
-        name = "@";
-        value = pagesSubdomainFor "personal_website";
-        type = "CNAME";
-        zone_id = mydadleft_me;
-      };
-
-      mydadleft_me_keyoxide = {
-        name = "@";
-        value = "$argon2id$v=19$m=512,t=256,p=1$AlA6W5fP7J14zMsw0W5KFQ$EQz/NCE0/TQpE64r2Eo/yOpjtMZ9WXevHsv3YYP7CXg";
-        type = "TXT";
-        zone_id = mydadleft_me;
-      };
-
-      mydadleft_me_www = {
-        name = "www";
-        value = "mydadleft.me";
-        type = "CNAME";
-        zone_id = mydadleft_me;
-      };
-
-      mydadleft_me_api = {
-        name = "api";
-        value = pagesSubdomainFor "teawie_api";
-        type = "CNAME";
-        zone_id = mydadleft_me;
-      };
-
-      mydadleft_me_miniflux = {
-        name = "miniflux";
-        value = atlas_tunnel;
-        type = "CNAME";
-        zone_id = mydadleft_me;
-      };
     }
-    // blockEmailSpoofingFor "mydadleft_me"
     // blockEmailSpoofingFor "getchoo_com";
 }
diff --git a/ext/terranix/cloudflare/pages_domains.nix b/ext/terranix/cloudflare/pages_domains.nix
index c1273bd..c3c45bb 100644
--- a/ext/terranix/cloudflare/pages_domains.nix
+++ b/ext/terranix/cloudflare/pages_domains.nix
@@ -20,11 +20,11 @@ in {
     setDomainsFor {
       account_id = lib.tfRef "var.account_id";
       project = "personal_website";
-      domains = ["mydadleft.me" "getchoo.com"];
+      domains = ["getchoo.com"];
     }
     // setDomainsFor {
       account_id = lib.tfRef "var.account_id";
       project = "teawie_api";
-      domains = ["api.mydadleft.me" "api.getchoo.com"];
+      domains = ["api.getchoo.com"];
     };
 }
diff --git a/ext/terranix/cloudflare/ruleset.nix b/ext/terranix/cloudflare/ruleset.nix
index c5be56f..9f611c4 100644
--- a/ext/terranix/cloudflare/ruleset.nix
+++ b/ext/terranix/cloudflare/ruleset.nix
@@ -1,10 +1,10 @@
 {lib, ...}: {
   resource.cloudflare_ruleset = {
-    mydadleft_me_redirects = {
+    getchoo_com_redirects = {
       kind = "zone";
       name = "default";
       phase = "http_request_dynamic_redirect";
-      zone_id = lib.tfRef "var.mydadleft_me_zone_id";
+      zone_id = lib.tfRef "var.getchoo_com_zone_id";
 
       rules = [
         {
@@ -20,22 +20,7 @@
           };
           description = "funny";
           enabled = true;
-          expression = "(http.request.uri.path eq \"/hacks\" and http.host eq \"mydadleft.me\")";
-        }
-        {
-          action = "redirect";
-          action_parameters = {
-            from_value = {
-              preserve_query_string = false;
-              status_code = 301;
-              target_url = {
-                value = "https://www.youtube.com/watch?v=RvVdFXOFcjw";
-              };
-            };
-          };
-          description = "onlyfriends";
-          enabled = true;
-          expression = "(http.request.uri.path eq \"/onlyfriends\" and http.host eq \"mydadleft.me\")";
+          expression = "(http.request.uri.path eq \"/hacks\" and http.host eq \"getchoo.com\")";
         }
       ];
     };
diff --git a/ext/terranix/cloudflare/tls.nix b/ext/terranix/cloudflare/tls.nix
index 8147bec..1fcc7ac 100644
--- a/ext/terranix/cloudflare/tls.nix
+++ b/ext/terranix/cloudflare/tls.nix
@@ -5,11 +5,6 @@
   };
 in {
   resource.cloudflare_zone_settings_override = {
-    mydadleft_me_settings = {
-      zone_id = lib.tfRef "var.mydadleft_me_zone_id";
-      settings = baseSettings;
-    };
-
     getchoo_com_settings = {
       zone_id = lib.tfRef "var.getchoo_com_zone_id";
       settings = baseSettings;
diff --git a/ext/terranix/cloudflare/tunnels.nix b/ext/terranix/cloudflare/tunnels.nix
index e2b0c7b..f745deb 100644
--- a/ext/terranix/cloudflare/tunnels.nix
+++ b/ext/terranix/cloudflare/tunnels.nix
@@ -10,11 +10,6 @@
     });
 
   resource.cloudflare_authenticated_origin_pulls = {
-    mydadleft_me_origin = {
-      zone_id = lib.tfRef "var.mydadleft_me_zone_id";
-      enabled = true;
-    };
-
     getchoo_com_origin = {
       zone_id = lib.tfRef "var.getchoo_com_zone_id";
       enabled = true;
diff --git a/ext/terranix/vars.nix b/ext/terranix/vars.nix
index 31ee464..afee9de 100644
--- a/ext/terranix/vars.nix
+++ b/ext/terranix/vars.nix
@@ -1,7 +1,6 @@
 {
   variable = {
     # cloudflare
-    mydadleft_me_zone_id.default = "53286ae07c44ed39e4b1249a2adb6d4d";
     getchoo_com_zone_id.default = "5ab8019935bfb8838a820aa68250eb77";
     account_id.default = "44c47ae2d55db34c1bf2f378ea8202f1";
 
diff --git a/systems/atlas/nginx.nix b/systems/atlas/nginx.nix
index d453b15..9fe0b38 100644
--- a/systems/atlas/nginx.nix
+++ b/systems/atlas/nginx.nix
@@ -4,18 +4,12 @@
   ...
 }: let
   inherit (inputs.self.lib.nginx) mkProxy toVHosts;
-
-  miniflux = {
-    locations = mkProxy "/" "7000";
-  };
 in {
   services.nginx = {
-    virtualHosts =
-      toVHosts config.networking.domain {
-        inherit miniflux;
-      }
-      // toVHosts "mydadleft.me" {
-        inherit miniflux;
+    virtualHosts = toVHosts config.networking.domain {
+      miniflux = {
+        locations = mkProxy "/" "7000";
       };
+    };
   };
 }