From 202baf61b6d342fa7a31bca02828acf48db09313 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Thu, 18 Sep 2025 18:50:41 +0200 Subject: [PATCH] remove test setup from lpt2 --- nixosConfigurations/vinzenz-lpt2/default.nix | 1 - nixosConfigurations/vinzenz-lpt2/nginx.nix | 66 ------------------- .../vinzenz-lpt2/zerforschen-plus.nix | 38 ----------- 3 files changed, 105 deletions(-) delete mode 100644 nixosConfigurations/vinzenz-lpt2/nginx.nix delete mode 100644 nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix diff --git a/nixosConfigurations/vinzenz-lpt2/default.nix b/nixosConfigurations/vinzenz-lpt2/default.nix index 58eac82..255dd7a 100644 --- a/nixosConfigurations/vinzenz-lpt2/default.nix +++ b/nixosConfigurations/vinzenz-lpt2/default.nix @@ -1,7 +1,6 @@ { imports = [ ./hardware.nix - ./nginx.nix ]; config = { diff --git a/nixosConfigurations/vinzenz-lpt2/nginx.nix b/nixosConfigurations/vinzenz-lpt2/nginx.nix deleted file mode 100644 index d5fd6a4..0000000 --- a/nixosConfigurations/vinzenz-lpt2/nginx.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ pkgs, ... }: -let - blog-domain-socket = "/run/nginx/blog.sock"; - anubis-domain-socket = "/run/anubis/anubis-blog.sock"; -in -{ - users.groups = { - anubis.members = [ "nginx" ]; - nginx.members = [ "anubis" ]; - }; - services = { - nginx = { - enable = true; - - recommendedProxySettings = true; - recommendedTlsSettings = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - - virtualHosts = { - #"vinzenz-lpt2" = { - # locations."/" = { - # proxyPass = "http://127.0.0.1:3000/"; - # proxyWebsockets = true; - # }; - # - # serverAliases = [ "172.23.42.96" ]; - #}; - - "vinzenz-lpt2" = { - locations."/" = { - proxyPass = "http://unix:" + anubis-domain-socket; - }; - }; - - "vinzenz-lpt2-in-anubis" = { - root = pkgs.zerforschen-plus-content; - listen = [ - { - addr = "unix:" + blog-domain-socket; - } - ]; - }; - }; - }; - - #networking.firewall = { - # allowedTCPPorts = [ - # 80 - # 8001 - # 3000 - # ]; - # allowedUDPPorts = [ 2342 ]; - #}; - - anubis = { - instances.main = { - enable = true; - settings = { - BIND = anubis-domain-socket; - TARGET = "unix://" + blog-domain-socket; - }; - }; - }; - }; -} diff --git a/nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix b/nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix deleted file mode 100644 index d2b919d..0000000 --- a/nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - pkgs, - ... -}: -{ - security.acme = { - acceptTerms = true; - defaults.email = "acme@zerforschen.plus"; - }; - - security.pam.services.nginx.setEnvironment = false; - systemd.services.nginx.serviceConfig = { - SupplementaryGroups = [ "shadow" ]; - }; - - services.nginx = { - enable = true; - additionalModules = [ pkgs.nginxModules.pam ]; - - recommendedProxySettings = true; - recommendedTlsSettings = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - - virtualHosts = { - "zerforschen.plus" = { - #addSSL = true; - #enableACME = true; - root = pkgs.zerforschen-plus-content; - }; - }; - }; - - #networking.firewall.allowedTCPPorts = [ - # 80 - # 443 - #]; -}