From b0599a3d23878da7335e6ae754ebffbd9ac7cbc3 Mon Sep 17 00:00:00 2001 From: ene Date: Sun, 19 Mar 2023 19:53:47 +0100 Subject: Revert "Merge pull request 'Feat: Add Website' (#17) from server1_nginx into server1" This reverts commit 563521c360073d5c28d2553ec4e1792eb2b14258, reversing changes made to c50431b189e982a631d2d4864b304f33169bacdb. This is necessary, because it makes a stable base unavailable. --- flake.nix | 1 + services/default.nix | 3 +-- services/services/acme.nix | 6 ------ services/services/nginx.nix | 15 --------------- 4 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 services/services/acme.nix delete mode 100644 services/services/nginx.nix diff --git a/flake.nix b/flake.nix index 9df3c84..2e52203 100644 --- a/flake.nix +++ b/flake.nix @@ -18,3 +18,4 @@ }; }; } + diff --git a/services/default.nix b/services/default.nix index c301ba1..6983529 100644 --- a/services/default.nix +++ b/services/default.nix @@ -1,7 +1,6 @@ {config, ...}: { imports = [ - ./services/acme.nix - ./services/nginx.nix + ./services/minecraft.nix ./services/nix.nix ./services/opensshd.nix ./services/rust-motd.nix diff --git a/services/services/acme.nix b/services/services/acme.nix deleted file mode 100644 index 42f9ed5..0000000 --- a/services/services/acme.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - security.acme = { - acceptTerms = true; - defaults.email = "admin@vhack.eu"; - }; -} diff --git a/services/services/nginx.nix b/services/services/nginx.nix deleted file mode 100644 index 204783b..0000000 --- a/services/services/nginx.nix +++ /dev/null @@ -1,15 +0,0 @@ -{...}: { - networking.firewall = { - allowedTCPPorts = [80 443]; - }; - services.nginx = { - enable = true; - virtualHosts = { - "vhack.eu" = { - forceSSL = true; - enableACME = true; - root = "/srv/www/vhack.eu"; - }; - }; - }; -} -- cgit 1.4.1