From 9b72ba2d43c9a40389a591ed85d12989b21891e6 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 20 Mar 2024 16:57:36 +0100 Subject: [PATCH] remove wordpress --- justfile | 2 ++ modules/containers/wordpress-schule.nix | 38 ------------------------- modules/proxy.nix | 7 ----- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 modules/containers/wordpress-schule.nix diff --git a/justfile b/justfile index 6351c1a..5e18a7e 100644 --- a/justfile +++ b/justfile @@ -6,3 +6,5 @@ build: update: nix flake update --commit-lock-file + just deploy + ssh root@katzen.cafe ./update-arion.sh diff --git a/modules/containers/wordpress-schule.nix b/modules/containers/wordpress-schule.nix deleted file mode 100644 index 16914c5..0000000 --- a/modules/containers/wordpress-schule.nix +++ /dev/null @@ -1,38 +0,0 @@ -{...}: { - containers."schule-wp" = { - autoStart = true; - privateNetwork = true; - hostAddress = "10.0.4.1"; - localAddress = "10.0.4.2"; - bindMounts = { - "/var/wp" = { - hostPath = "/schule-wp"; - isReadOnly = false; - }; - }; - config = { - config, - pkgs, - ... - }: { - services.wordpress = { - sites."schule" = { - virtualHost = { - hostName = "wp.schule.katzen.cafe"; - adminAddr = "schule@schrottkatze.de"; - listen = [ - { - ip = "10.0.4.2"; - port = 80; - ssl = false; - } - ]; - }; - }; - }; - system.stateVersion = "23.11"; - }; - }; - deployment.keys = { - }; -} diff --git a/modules/proxy.nix b/modules/proxy.nix index 81cb09b..0268860 100644 --- a/modules/proxy.nix +++ b/modules/proxy.nix @@ -208,13 +208,6 @@ add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; ''; }; - "wp.schule.katzen.cafe" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://10.0.4.2"; - }; - }; }; }; }