From f1203f33df5766bf851b1582bd1ea74699e5f6ec Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 01:43:35 +0000 Subject: [PATCH 01/16] add html --- hosts/leon/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index c74b94a7..14359264 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -207,7 +207,8 @@ networking.wireguard.interfaces = { virtualHosts."cloud.bicospacetech.c3d2.de" = { forceSSL = true; enableACME = true; - locations."/" = { + locations."/home" = { + index dude.html; proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; From 4a1ac9dc9d867ef33c427a3b76975ebeced4ef5a Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 01:44:34 +0000 Subject: [PATCH 02/16] fix --- hosts/leon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 14359264..98c94276 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -208,7 +208,7 @@ networking.wireguard.interfaces = { forceSSL = true; enableACME = true; locations."/home" = { - index dude.html; + index = dude.html; proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; From afcd7f32a72fb7055e6a88e0c5ca095671333b12 Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 01:45:39 +0000 Subject: [PATCH 03/16] fix --- hosts/leon/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 98c94276..272222b3 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -207,8 +207,7 @@ networking.wireguard.interfaces = { virtualHosts."cloud.bicospacetech.c3d2.de" = { forceSSL = true; enableACME = true; - locations."/home" = { - index = dude.html; + locations."/home/dude.html" = { proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; From 3d5e202ac0669f51bb31dbe47854dbf53e69150a Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 01:52:57 +0000 Subject: [PATCH 04/16] update --- hosts/leon/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 272222b3..23886ea3 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -207,8 +207,10 @@ networking.wireguard.interfaces = { virtualHosts."cloud.bicospacetech.c3d2.de" = { forceSSL = true; enableACME = true; - locations."/home/dude.html" = { - proxyPass = "http://10.10.11.2:2500"; + locations."/html/" = { + root = "/home/html"; + index dude.html; + #proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; }; From 65eba5ebf7877f9cc61b980b38d8953de7cd67e1 Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 01:53:55 +0000 Subject: [PATCH 05/16] update --- hosts/leon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 23886ea3..40457c2f 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -208,7 +208,7 @@ networking.wireguard.interfaces = { forceSSL = true; enableACME = true; locations."/html/" = { - root = "/home/html"; + root = "/home/html/"; index dude.html; #proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; From 80c8ed5a45dfb9d43286d809deb7f1e2527661e0 Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 02:00:27 +0000 Subject: [PATCH 06/16] update --- hosts/leon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 40457c2f..738b3e4e 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -207,9 +207,9 @@ networking.wireguard.interfaces = { virtualHosts."cloud.bicospacetech.c3d2.de" = { forceSSL = true; enableACME = true; - locations."/html/" = { - root = "/home/html/"; - index dude.html; + root = /home/html; + index index.html; + locations."/" = { #proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; From e4262a4dab2b53ffd4b32a2a99b9b772d8d954e2 Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 02:00:58 +0000 Subject: [PATCH 07/16] update --- hosts/leon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 738b3e4e..107a29a2 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -208,7 +208,7 @@ networking.wireguard.interfaces = { forceSSL = true; enableACME = true; root = /home/html; - index index.html; + index = index.html; locations."/" = { #proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; From aa607866d12255ed2cfc750a940d3e0c3bced49a Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 02:01:39 +0000 Subject: [PATCH 08/16] update --- hosts/leon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 107a29a2..86f54cf1 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -207,8 +207,8 @@ networking.wireguard.interfaces = { virtualHosts."cloud.bicospacetech.c3d2.de" = { forceSSL = true; enableACME = true; - root = /home/html; - index = index.html; + root = "/home/html"; + index = "index.html"; locations."/" = { #proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; From 82c6de7b9d9c6de17ecc43fd55d136906cfe0ab8 Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 02:04:18 +0000 Subject: [PATCH 09/16] update --- hosts/leon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 86f54cf1..93e94d8c 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -207,9 +207,9 @@ networking.wireguard.interfaces = { virtualHosts."cloud.bicospacetech.c3d2.de" = { forceSSL = true; enableACME = true; - root = "/home/html"; - index = "index.html"; locations."/" = { + root = "/home/html"; + index = "index.html"; #proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; From 69da87ecdb293ccf3c45850d8fe8acb60dc9c819 Mon Sep 17 00:00:00 2001 From: leon Date: Thu, 24 Nov 2022 02:07:13 +0000 Subject: [PATCH 10/16] update --- hosts/leon/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 93e94d8c..81b7633c 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -208,9 +208,7 @@ networking.wireguard.interfaces = { forceSSL = true; enableACME = true; locations."/" = { - root = "/home/html"; - index = "index.html"; - #proxyPass = "http://10.10.11.2:2500"; + proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; }; From deb314f8e438bb66fa228b254e83a3ca9c695528 Mon Sep 17 00:00:00 2001 From: leon Date: Fri, 25 Nov 2022 18:05:46 +0000 Subject: [PATCH 11/16] update --- hosts/leon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 81b7633c..9e272728 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -26,7 +26,6 @@ # `...-' `...-' #-------------------------------------------------------------------------------- { config, lib, pkgs, ... }: - { deployment = { persistedShares = [ "/etc" "/home" "/var" ]; From 3c0c101dd7aec073d7a81e7158fa59142b85a25d Mon Sep 17 00:00:00 2001 From: leon Date: Fri, 25 Nov 2022 18:33:58 +0000 Subject: [PATCH 12/16] update --- hosts/leon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 9e272728..ca0e295a 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -25,6 +25,7 @@ # ' / `-----'' / | # `...-' `...-' #-------------------------------------------------------------------------------- + { config, lib, pkgs, ... }: { deployment = { From 930c3a67e0d1739fe240f9e7d00c741372444a36 Mon Sep 17 00:00:00 2001 From: leon Date: Fri, 25 Nov 2022 23:27:45 +0000 Subject: [PATCH 13/16] update --- hosts/leoncloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 57165182..97d3876c 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -65,7 +65,7 @@ privateKeyFile = "/etc/nixos/wireguard-keys/private-key"; peers = [ { - publicKey = "w3qegSSuqFTFrGk4XJaWBSwGDOiqbnnAIR9MzwjYVA8="; + publicKey = "iEVq4lvvKFfqjcoYYyNkA0MS8rcSGaDfPwQGN3C7+D0="; allowedIPs = [ "10.10.11.0/24" ]; endpoint = "45.158.40.162:18900"; persistentKeepalive = 25; From a33b2abe29b61c6919ab9886eb540eeb05d32927 Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 01:47:34 +0000 Subject: [PATCH 14/16] update --- hosts/leoncloud/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 97d3876c..08555920 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -109,7 +109,25 @@ services.nextcloud = { after = ["postgresql.service"]; }; + services.nginx.virtualHosts."localhost".listen = [ { addr = "127.0.0.1"; port = 8080; } ]; + + #<-----------------nextcloud---------------------- +#-----------------------------ngin-X-------------------------------- + + services.nginx = { + enable = true; + +# virtualHosts."bicospacetech.c3d2.de" = { +# forceSSL = true; +# enableACME = true; +# locations."/" = { +# proxyPass = "http://45.158.40.162:12000"; +# proxyWebsockets = true; +# }; + +#}; +#-----------------------------ngin-X-------------------------------- system.stateVersion = "22.05"; From c67ba25488382351270ad59401022f19e1a5cc4a Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 01:48:17 +0000 Subject: [PATCH 15/16] update --- hosts/leoncloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 08555920..4f990c92 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -115,8 +115,8 @@ services.nextcloud = { #<-----------------nextcloud---------------------- #-----------------------------ngin-X-------------------------------- - services.nginx = { - enable = true; +# services.nginx = { +# enable = true; # virtualHosts."bicospacetech.c3d2.de" = { # forceSSL = true; From 2b2982961c4c0e71542a00ce4b9a4e72c524cc09 Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 01:51:49 +0000 Subject: [PATCH 16/16] update --- hosts/leoncloud/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 4f990c92..55f691b6 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -9,6 +9,7 @@ nix.settings.auto-optimise-store = lib.mkForce false; + networking = { hostName = "leoncloud"; firewall.enable = true;