From 6a7d9316013443a3aa5ebcf14d5896f13db7de90 Mon Sep 17 00:00:00 2001 From: leon Date: Mon, 21 Nov 2022 23:46:58 +0000 Subject: [PATCH 01/32] update nginx --- 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 84bc5582..ceeb9f81 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -207,7 +207,7 @@ networking.wireguard.interfaces = { #-----------------------------ngin-X-------------------------------- services.nginx = { - defaultListenAddresses = [ "0.0.0.0:80" ]; + Listen = 80 enable = true; virtualHosts."bicospacetech.c3d2.de" = { default = true; From 0b64798dd1158f9ea4c9da35eede216cb1d5d01a Mon Sep 17 00:00:00 2001 From: leon Date: Mon, 21 Nov 2022 23:48:03 +0000 Subject: [PATCH 02/32] first try --- hosts/leon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index ceeb9f81..0431c7d5 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -223,7 +223,6 @@ networking.wireguard.interfaces = { -#--------------------------Up-Stream-------------------------------- system.stateVersion = "22.05"; From 614b3bc3b2d78d9d78a2f414957b28c5e8ba430c Mon Sep 17 00:00:00 2001 From: leon Date: Mon, 21 Nov 2022 23:57:57 +0000 Subject: [PATCH 03/32] fix syntax --- 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 0431c7d5..3cb326fb 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -207,7 +207,7 @@ networking.wireguard.interfaces = { #-----------------------------ngin-X-------------------------------- services.nginx = { - Listen = 80 + Listen = 80; enable = true; virtualHosts."bicospacetech.c3d2.de" = { default = true; From 200b82bd5a920302818fa6d09e155a30ea973fad Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 00:01:49 +0000 Subject: [PATCH 04/32] fix --- hosts/leon/default.nix | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 3cb326fb..85e4479b 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -206,19 +206,18 @@ networking.wireguard.interfaces = { #-----------------------------ngin-X-------------------------------- - services.nginx = { - Listen = 80; - enable = true; - virtualHosts."bicospacetech.c3d2.de" = { - default = true; - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://45.158.40.162:12000"; - proxyWebsockets = true; - }; - }; -}; +# services.nginx = { +# enable = true; +# virtualHosts."bicospacetech.c3d2.de" = { +# default = true; +# forceSSL = true; +# enableACME = true; +# locations."/" = { +# proxyPass = "http://45.158.40.162:12000"; +# proxyWebsockets = true; +# }; +# }; +#}; #-----------------------------ngin-X-------------------------------- From e0d42faa3cab5ad79ec85549d8001f77462939d4 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 00:34:54 +0000 Subject: [PATCH 05/32] update --- hosts/leon/default.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 85e4479b..737ff88f 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -159,17 +159,7 @@ allowedIPs = [ "10.10.11.30" ]; } #---------------------black----------------------------. - { - #black-phone - publicKey= "3GEocBTOztOKWtWQFOmI5hynPiPcMMe54kVaHECAG1A="; - allowedIPs = [ "10.10.11.90" ]; - } - { - #black-desktop - publicKey= "24TAa1HMXTPaFNfbXLkuxVy305NjSAegMSYjKLH5Kjc="; - allowedIPs = [ "10.10.11.91" ]; - } - + ]; }; }; From 0475cc58b0205d6ac5e94180902690584ad2b253 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 12:05:34 +0000 Subject: [PATCH 06/32] add nginx --- hosts/leon/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 737ff88f..6f6a3979 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -196,18 +196,19 @@ networking.wireguard.interfaces = { #-----------------------------ngin-X-------------------------------- -# services.nginx = { -# enable = true; -# virtualHosts."bicospacetech.c3d2.de" = { -# default = true; -# forceSSL = true; -# enableACME = true; -# locations."/" = { -# proxyPass = "http://45.158.40.162:12000"; -# proxyWebsockets = true; -# }; -# }; -#}; + services.nginx = { + enable = true; += + virtualHosts."bicospacetech.c3d2.de" = { + default = true; + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://45.158.40.162:12000"; + proxyWebsockets = true; + }; + }; +}; #-----------------------------ngin-X-------------------------------- From dab7d198aaa9bc5520080756d68be3094c263199 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 12:08:32 +0000 Subject: [PATCH 07/32] update --- hosts/leon/default.nix | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 6f6a3979..009684b0 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -196,19 +196,18 @@ networking.wireguard.interfaces = { #-----------------------------ngin-X-------------------------------- - services.nginx = { - enable = true; -= - virtualHosts."bicospacetech.c3d2.de" = { - default = true; - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://45.158.40.162:12000"; - proxyWebsockets = true; - }; - }; -}; +# services.nginx = { +# enable = true; +# virtualHosts."bicospacetech.c3d2.de" = { +# default = true; +# forceSSL = true; +# enableACME = true; +# locations."/" = { +# proxyPass = "http://45.158.40.162:12000"; +# proxyWebsockets = true; +# }; +# }; +#}; #-----------------------------ngin-X-------------------------------- From 436f2e59f01dfcbd6944d4e8956365ddaf77f24f Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 12:09:51 +0000 Subject: [PATCH 08/32] 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 009684b0..792c2fe2 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -70,7 +70,7 @@ networking.firewall = { allowedTCPPorts = [ 5000 22 53 80 443 8080 12000 ]; - allowedUDPPorts = [ 5000 22 53 80 8080 18900 19900 ]; + allowedUDPPorts = [ 53 80 8080 18900 19900 ]; }; #_______________________________Begin-VPN1-Server____________________________________ From f6f280c008e9884af60d722e8300dcd3171648c2 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 12:15:45 +0000 Subject: [PATCH 09/32] update --- hosts/leon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 792c2fe2..e790fd20 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -26,7 +26,6 @@ # `...-' `...-' #-------------------------------------------------------------------------------- - { config, lib, pkgs, ... }: { From 2cd2f86bc5c6cdbb77ed1e1ff1eda24cde6fad09 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 18:30:32 +0000 Subject: [PATCH 10/32] update nginx --- hosts/leon/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index e790fd20..bc6929b9 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -195,18 +195,19 @@ networking.wireguard.interfaces = { #-----------------------------ngin-X-------------------------------- -# services.nginx = { -# enable = true; -# virtualHosts."bicospacetech.c3d2.de" = { -# default = true; -# forceSSL = true; -# enableACME = true; -# locations."/" = { -# proxyPass = "http://45.158.40.162:12000"; -# proxyWebsockets = true; -# }; -# }; -#}; + services.nginx = { + enable = true; + listen = [{port = 80; addr="0.0.0.0"; ssl=true;}]; + virtualHosts."bicospacetech.c3d2.de" = { + default = true; + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://45.158.40.162:12000"; + proxyWebsockets = true; + }; + }; +}; #-----------------------------ngin-X-------------------------------- From b0d3cdc14f431e312c347e65f08b34543564f964 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 18:32:58 +0000 Subject: [PATCH 11/32] update nginx --- 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 bc6929b9..a1ac555b 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -197,8 +197,8 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; - listen = [{port = 80; addr="0.0.0.0"; ssl=true;}]; virtualHosts."bicospacetech.c3d2.de" = { + listen = [{port = 80; addr="0.0.0.0"; ssl=true;}]; default = true; forceSSL = true; enableACME = true; From dcc2dfd349ecb760101e22a40bc460849b6533b8 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 18:48:14 +0000 Subject: [PATCH 12/32] 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 a1ac555b..b5ae2ecf 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,7 +198,7 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - listen = [{port = 80; addr="0.0.0.0"; ssl=true;}]; + listen = [{port = 80; addr="0.0.0.0"; }]; default = true; forceSSL = true; enableACME = true; From d5dc241f3e599736519681a7dacff51b2c082ce0 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 19:57:44 +0000 Subject: [PATCH 13/32] 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 b5ae2ecf..94956a8f 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,9 +198,9 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - listen = [{port = 80; addr="0.0.0.0"; }]; + listen = [{port = 80; }]; default = true; - forceSSL = true; + forceSSL = false; enableACME = true; locations."/" = { proxyPass = "http://45.158.40.162:12000"; From 830c9a8f97c2fbbd570671cb1b6536a100d131c2 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 19:58:47 +0000 Subject: [PATCH 14/32] 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 94956a8f..75c65953 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,7 +198,7 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - listen = [{port = 80; }]; + listen = [port = 80 ]; default = true; forceSSL = false; enableACME = true; From 1c46b257711b795495b584c6c63d29c017fd69a8 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 19:59:33 +0000 Subject: [PATCH 15/32] 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 75c65953..f66926dc 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,7 +198,7 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - listen = [port = 80 ]; + listen = [port = 80; ]; default = true; forceSSL = false; enableACME = true; From 9032b47bba6a55d4c1c31a42f371fa58642b0201 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 20:00:19 +0000 Subject: [PATCH 16/32] 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 f66926dc..838b619b 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,7 +198,7 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - listen = [port = 80; ]; + listen = [{port = 80; addr="localhost";} ]; default = true; forceSSL = false; enableACME = true; From b2d52e18ea0bdd19198821daccca5f6e45f1a518 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 20:30:48 +0000 Subject: [PATCH 17/32] add nameserver --- 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 838b619b..177c98b4 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -66,7 +66,7 @@ openssh.authorizedKeys.keys = with import ../../users.nix; leon.sshKeys; }; - + networking.nameservers = ["172.20.73.8","9.9.9.9"] networking.firewall = { allowedTCPPorts = [ 5000 22 53 80 443 8080 12000 ]; allowedUDPPorts = [ 53 80 8080 18900 19900 ]; From c3d1cb2fa67d424e621ae2bc0ef490f66e5e2f14 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 20:31:51 +0000 Subject: [PATCH 18/32] 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 177c98b4..30744384 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -66,7 +66,7 @@ openssh.authorizedKeys.keys = with import ../../users.nix; leon.sshKeys; }; - networking.nameservers = ["172.20.73.8","9.9.9.9"] + networking.nameservers = ["172.20.73.8" "9.9.9.9"] networking.firewall = { allowedTCPPorts = [ 5000 22 53 80 443 8080 12000 ]; allowedUDPPorts = [ 53 80 8080 18900 19900 ]; From ac039e0367ef2344a516a7ec551e822ef950840b Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 20:32:38 +0000 Subject: [PATCH 19/32] 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 30744384..06ef1c68 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -66,7 +66,7 @@ openssh.authorizedKeys.keys = with import ../../users.nix; leon.sshKeys; }; - networking.nameservers = ["172.20.73.8" "9.9.9.9"] + networking.nameservers = ["172.20.73.8" "9.9.9.9"]; networking.firewall = { allowedTCPPorts = [ 5000 22 53 80 443 8080 12000 ]; allowedUDPPorts = [ 53 80 8080 18900 19900 ]; From 7a749c9a4507d2c502419f11cfdfe1b41715cf8f Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 20:43:42 +0000 Subject: [PATCH 20/32] 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 06ef1c68..097bd250 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,9 +198,9 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - listen = [{port = 80; addr="localhost";} ]; + # listen = [{port = 80; addr="localhost";} ]; default = true; - forceSSL = false; + forceSSL = true; enableACME = true; locations."/" = { proxyPass = "http://45.158.40.162:12000"; From 9ea5e27a42cd8b05e1d81ac2ef4dd884b95d900a Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 21:14:14 +0000 Subject: [PATCH 21/32] update nginx --- hosts/leon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 097bd250..d2ad5895 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,7 +198,6 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - # listen = [{port = 80; addr="localhost";} ]; default = true; forceSSL = true; enableACME = true; From ecd85a41e8a580ad4232ebc3f6b5ff32c68a4fe1 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 21:34:16 +0000 Subject: [PATCH 22/32] update --- hosts/leon/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index d2ad5895..e4266fd7 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -206,6 +206,17 @@ networking.wireguard.interfaces = { proxyWebsockets = true; }; }; + virtualHosts."cloud.bicospacetech.c3d2.de" = { + default = true; + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://45.158.40.162:8080"; + proxyWebsockets = true; + }; + } + + }; #-----------------------------ngin-X-------------------------------- From 345960c777d6b73bad0c17363d7068f1a1974e7c Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 21:34:51 +0000 Subject: [PATCH 23/32] 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 e4266fd7..e1888844 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -214,7 +214,7 @@ networking.wireguard.interfaces = { proxyPass = "http://45.158.40.162:8080"; proxyWebsockets = true; }; - } + }; }; From 056276a5796f18e3562f21372c93f34e4ee8a1f1 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 21:52:00 +0000 Subject: [PATCH 24/32] update --- hosts/leon/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index e1888844..81913963 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,7 +198,7 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - default = true; + # default = true; forceSSL = true; enableACME = true; locations."/" = { @@ -207,7 +207,6 @@ networking.wireguard.interfaces = { }; }; virtualHosts."cloud.bicospacetech.c3d2.de" = { - default = true; forceSSL = true; enableACME = true; locations."/" = { @@ -215,8 +214,6 @@ networking.wireguard.interfaces = { proxyWebsockets = true; }; }; - - }; #-----------------------------ngin-X-------------------------------- From 50d29f7af3aa8d77c3bc20d2832e9ae9e3e6d2ea Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 23:27:40 +0000 Subject: [PATCH 25/32] 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 81913963..52921d6f 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -198,7 +198,6 @@ networking.wireguard.interfaces = { services.nginx = { enable = true; virtualHosts."bicospacetech.c3d2.de" = { - # default = true; forceSSL = true; enableACME = true; locations."/" = { @@ -210,10 +209,9 @@ networking.wireguard.interfaces = { forceSSL = true; enableACME = true; locations."/" = { - proxyPass = "http://45.158.40.162:8080"; + proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; - }; }; #-----------------------------ngin-X-------------------------------- From bcd82e69fefeb619d50c0e5aecab05d7ce92f19e Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 23:28:41 +0000 Subject: [PATCH 26/32] update --- hosts/leon/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 52921d6f..0c2a4319 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -212,6 +212,11 @@ networking.wireguard.interfaces = { proxyPass = "http://10.10.11.2:2500"; proxyWebsockets = true; }; + }; + + + + }; #-----------------------------ngin-X-------------------------------- @@ -220,4 +225,5 @@ networking.wireguard.interfaces = { system.stateVersion = "22.05"; -} + +}; From f2b57ee0ec3eb6b6811a716bb9f60080d30ed65f Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 23:29:03 +0000 Subject: [PATCH 27/32] update --- hosts/leon/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 0c2a4319..040aab68 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -223,7 +223,5 @@ networking.wireguard.interfaces = { - system.stateVersion = "22.05"; -}; From 37dd2e059114125b5e09485bacdb168686b0082f Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 23:30:10 +0000 Subject: [PATCH 28/32] update --- hosts/leon/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 040aab68..9f4c7a38 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -213,15 +213,9 @@ networking.wireguard.interfaces = { proxyWebsockets = true; }; }; - - - - }; #-----------------------------ngin-X-------------------------------- - - - system.stateVersion = "22.05"; +}; From 45d40e1e1be428b74561c3795ef6330ef56252ad Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 23:31:39 +0000 Subject: [PATCH 29/32] 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 9f4c7a38..01379a8b 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -218,4 +218,4 @@ networking.wireguard.interfaces = { system.stateVersion = "22.05"; -}; +} From 08c76646254ef7d3cf38ebdd9742010b29616a50 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 22 Nov 2022 23:51:09 +0000 Subject: [PATCH 30/32] update --- hosts/leon/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 01379a8b..83f7e3ed 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -213,6 +213,16 @@ networking.wireguard.interfaces = { proxyWebsockets = true; }; }; + virtualHosts."portainer.netlab.ly" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://10.10.11.60:9000"; + proxyWebsockets = true; + }; + }; + + }; #-----------------------------ngin-X-------------------------------- From 474c9f90da37574e8cc7b89cc49e61b90b66adb7 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 23 Nov 2022 12:52:45 +0000 Subject: [PATCH 31/32] update ' --- hosts/leon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 83f7e3ed..5b3677e5 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -25,7 +25,6 @@ # ' / `-----'' / | # `...-' `...-' #-------------------------------------------------------------------------------- - { config, lib, pkgs, ... }: { From f377c855c5dd773edd21923bbc408fb82d50c9a9 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 23 Nov 2022 18:33:24 +0000 Subject: [PATCH 32/32] add domain to proxy --- 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 5b3677e5..c74b94a7 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -212,7 +212,7 @@ networking.wireguard.interfaces = { proxyWebsockets = true; }; }; - virtualHosts."portainer.netlab.ly" = { + virtualHosts."portainer.netlab.c3d2.de" = { forceSSL = true; enableACME = true; locations."/" = {