From b60d302c509cbc04f58ffcd998ffd6f806fe0f0f Mon Sep 17 00:00:00 2001
From: The Hedgehog <me@thehedgehog.me>
Date: Mon, 16 Jan 2023 18:17:39 -0500
Subject: [PATCH] update authentik and remove cloudflare services

---
 hosts/marvin/configuration.nix          |  4 ---
 hosts/marvin/services/authentik.nix     |  2 +-
 hosts/marvin/services/cf-dyndns.nix     | 10 ------
 hosts/marvin/services/cloudflared.nix   | 28 -----------------
 hosts/marvin/services/tubearchivist.nix | 42 -------------------------
 hosts/marvin/services/ytdl.nix          | 11 -------
 6 files changed, 1 insertion(+), 96 deletions(-)
 delete mode 100644 hosts/marvin/services/cf-dyndns.nix
 delete mode 100644 hosts/marvin/services/cloudflared.nix
 delete mode 100644 hosts/marvin/services/tubearchivist.nix
 delete mode 100644 hosts/marvin/services/ytdl.nix

diff --git a/hosts/marvin/configuration.nix b/hosts/marvin/configuration.nix
index 656e9a0..01593a0 100644
--- a/hosts/marvin/configuration.nix
+++ b/hosts/marvin/configuration.nix
@@ -21,8 +21,6 @@
     ./services/authentik.nix
     ./services/avahi.nix
     # ./services/caddy.nix
-    # ./services/cf-dyndns.nix
-    # ./services/cloudflared.nix
     ./services/dashboard.nix
     ./services/deemix.nix
     ./services/factorio.nix
@@ -48,10 +46,8 @@
     # ./services/step-ca.nix
     ./services/syncthing.nix
     ./services/tailscale.nix
-    # ./services/tubearchivist.nix
     ./services/vaultwarden.nix
     ./services/vikunja.nix
-    # ./services/ytdl.nix
     ./services/zfs.nix
 
     # Load Agenix
diff --git a/hosts/marvin/services/authentik.nix b/hosts/marvin/services/authentik.nix
index d615798..ace07d8 100644
--- a/hosts/marvin/services/authentik.nix
+++ b/hosts/marvin/services/authentik.nix
@@ -1,6 +1,6 @@
 {config, ...}: {
   virtualisation.oci-containers.containers = let
-    authentikVersion = "2022.11";
+    authentikVersion = "2022.12";
   in {
     authentik-db = {
       image = "postgres:12-alpine";
diff --git a/hosts/marvin/services/cf-dyndns.nix b/hosts/marvin/services/cf-dyndns.nix
deleted file mode 100644
index 383d398..0000000
--- a/hosts/marvin/services/cf-dyndns.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  services.cloudflare-dyndns = {
-    enable = false;
-    domains = ["wg.thehedgehog.me" "wg.pyrox.dev"];
-    ipv4 = true;
-    ipv6 = false;
-    proxied = false;
-    apiTokenFile = "/run/agenix/cf-dyndns-token";
-  };
-}
diff --git a/hosts/marvin/services/cloudflared.nix b/hosts/marvin/services/cloudflared.nix
deleted file mode 100644
index 20a07ee..0000000
--- a/hosts/marvin/services/cloudflared.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-  users.users.cloudflared = {
-    group = "cloudflared";
-    isSystemUser = true;
-  };
-  users.groups.cloudflared = {};
-
-  systemd.services.cloudflared = {
-    wantedBy = ["multi-user.target"];
-    after = ["network.target"];
-    serviceConfig = {
-      Description = "Cloudflared Tunnel Service";
-      ExecStart = "${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate run --cred-file /run/agenix/cloudflared-creds";
-      Restart = "on-failure";
-      RestartSec = "5s";
-      User = "cloudflared";
-      Group = "cloudflared";
-      Type = "notify";
-      TimeoutStartSec = 0;
-      ReadWriteDirectories = "/run/agenix";
-      EnvironmentFile = "/run/agenix/cloudflared-vars";
-    };
-  };
-}
diff --git a/hosts/marvin/services/tubearchivist.nix b/hosts/marvin/services/tubearchivist.nix
deleted file mode 100644
index 5e5547b..0000000
--- a/hosts/marvin/services/tubearchivist.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  virtualisation.oci-containers.containers = {
-    tubearchivist-server = {
-      image = "bbilly1/tubearchivist:latest";
-      ports = ["6912:8000"];
-      extraOptions = ["--network=archivist"];
-      volumes = [
-        "/var/lib/archivist/media:/youtube"
-        "/var/lib/archivist/cache:/cache"
-      ];
-      environment = {
-        ES_URL = "http://tubearchivist-elastic:9200";
-        REDIS_HOST = "tubearchivist-redis";
-        TA_HOST = "tube.pyrox.dev";
-        TA_USERNAME = "thehedgeh0g";
-        TA_PASSWORD = "insecurepassw0rd";
-        ELASTIC_PASSWORD = "tub3arch1vist";
-        TZ = "America/New_York";
-      };
-      dependsOn = ["tubearchivist-elastic" "tubearchivist-redis"];
-    };
-    tubearchivist-redis = {
-      image = "redislabs/rejson:latest";
-      dependsOn = ["tubearchivist-elastic"];
-      volumes = ["/var/lib/archivist/redis-data:/data"];
-      extraOptions = ["--network=archivist"];
-    };
-    tubearchivist-elastic = {
-      image = "bbilly1/tubearchivist-es:latest";
-      extraOptions = ["--network=archivist"];
-      environment = {
-        "xpack.security.enabled" = "true";
-        ELASTIC_PASSWORD = "tub3arch1vist";
-        "discovery.type" = "single-node";
-        ES_JAVA_OPTS = "-Xms512m -Xmx512m";
-      };
-      volumes = [
-        "/var/lib/archivist/es-data:/usr/share/elasticsearch/data"
-      ];
-    };
-  };
-}
diff --git a/hosts/marvin/services/ytdl.nix b/hosts/marvin/services/ytdl.nix
deleted file mode 100644
index 5cbcba3..0000000
--- a/hosts/marvin/services/ytdl.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  virtualisation.oci-containers.containers.ytdl = {
-    image = "alexta69/metube";
-    ports = ["6906:8081"];
-    volumes = ["/var/lib/music:/downloads"];
-    environment = {
-      UID = "996";
-      GID = "996";
-    };
-  };
-}