From 467a42b5cf925377a8820ff39196f46daf65bac5 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sun, 1 Dec 2024 14:46:47 -0500 Subject: [PATCH] decommissioning arch mirror --- systems/jeeves/arch_mirror.nix | 39 ------------------------- systems/jeeves/default.nix | 1 - systems/jeeves/docker/haproxy.cfg | 6 ---- systems/jeeves/docker/reverse_proxy.nix | 1 - 4 files changed, 47 deletions(-) delete mode 100644 systems/jeeves/arch_mirror.nix diff --git a/systems/jeeves/arch_mirror.nix b/systems/jeeves/arch_mirror.nix deleted file mode 100644 index 3f51c98..0000000 --- a/systems/jeeves/arch_mirror.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ inputs, pkgs, ... }: -let - vars = import ./vars.nix; -in -{ - users = { - users.arch-mirror = { - isSystemUser = true; - group = "arch-mirror"; - }; - groups.arch-mirror = {}; - }; - - virtualisation.oci-containers.containers.arch_mirror = { - image = "ubuntu/apache2:latest"; - volumes = [ - "${../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" - "${vars.media_mirror}:/data" - ]; - ports = [ "800:80" ]; - extraOptions = [ "--network=web" ]; - autoStart = true; - }; - - systemd.services.sync_mirror = { - requires = [ "network-online.target" ]; - after = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - description = "validates startup"; - path = [ pkgs.rsync ]; - serviceConfig = { - Environment = "MIRROR_DIR=${vars.media_mirror}/archlinux/"; - Type = "simple"; - User = "arch-mirror"; - Group = "arch-mirror"; - ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror"; - }; - }; -} diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix index 65595dd..3db8e85 100644 --- a/systems/jeeves/default.nix +++ b/systems/jeeves/default.nix @@ -8,7 +8,6 @@ in ../../common/optional/ssh_decrypt.nix ../../common/optional/syncthing_base.nix ../../common/optional/zerotier.nix - ./arch_mirror.nix ./docker ./hardware.nix ./home_assistant.nix diff --git a/systems/jeeves/docker/haproxy.cfg b/systems/jeeves/docker/haproxy.cfg index ff83b30..85a84e1 100644 --- a/systems/jeeves/docker/haproxy.cfg +++ b/systems/jeeves/docker/haproxy.cfg @@ -29,7 +29,6 @@ frontend ContentSwitching acl host_cache hdr(host) -i cache.tmmworkshop.com acl host_filebrowser hdr(host) -i filebrowser.tmmworkshop.com acl host_grafana hdr(host) -i grafana.tmmworkshop.com - acl host_mirror hdr(host) -i mirror.tmmworkshop.com acl host_photoprism hdr(host) -i photoprism.tmmworkshop.com acl host_uptime_kuma hdr(host) -i uptimekuma-jeeves.tmmworkshop.com @@ -37,7 +36,6 @@ frontend ContentSwitching use_backend cache_nodes if host_cache use_backend filebrowser_nodes if host_filebrowser use_backend grafana_nodes if host_grafana - use_backend mirror_nodes if host_mirror use_backend photoprism_nodes if host_photoprism use_backend uptime_kuma_nodes if host_uptime_kuma @@ -57,10 +55,6 @@ backend filebrowser_nodes mode http server server filebrowser:8080 -backend mirror_nodes - mode http - server server arch_mirror:80 - backend photoprism_nodes mode http server server photoprism:2342 diff --git a/systems/jeeves/docker/reverse_proxy.nix b/systems/jeeves/docker/reverse_proxy.nix index 36ae6cf..a548223 100644 --- a/systems/jeeves/docker/reverse_proxy.nix +++ b/systems/jeeves/docker/reverse_proxy.nix @@ -14,7 +14,6 @@ in "${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg" ]; dependsOn = [ - "arch_mirror" "audiobookshelf" "filebrowser" "grafana"