summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorene <ene@sils.li>2023-03-19 19:53:47 +0100
committerene <ene@sils.li>2023-03-19 19:53:47 +0100
commitb0599a3d23878da7335e6ae754ebffbd9ac7cbc3 (patch)
tree164c350e503c7dfda585ed505536b08882e00323
parentMerge pull request 'Feat: Add Website' (#17) from server1_nginx into server1 (diff)
downloadnixos-server-b0599a3d23878da7335e6ae754ebffbd9ac7cbc3.zip
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.
Diffstat (limited to '')
-rw-r--r--flake.nix1
-rw-r--r--services/default.nix3
-rw-r--r--services/services/acme.nix6
-rw-r--r--services/services/nginx.nix15
4 files changed, 2 insertions, 23 deletions
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";
- };
- };
- };
-}