From 40291903109b97989671bd34dd4f8cb4998fdbd4 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 7 Dec 2022 18:04:46 +0000 Subject: [PATCH 1/5] fixing ngix --- hosts/leon/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 4548e942..90a3bb90 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -209,14 +209,6 @@ networking.wireguard.interfaces = { locations."/" = { proxyPass = "http://45.158.40.165:80"; proxyWebsockets = true; - }; - }; - virtualHosts."bicospacetech.stream.c3d2.de" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://10.10.11.4:145000"; - proxyWebsockets = true; }; }; virtualHosts."portainer.netlab.c3d2.de" = { From 2232760bb2f49dcf790f6dc83268a87933f327c5 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 7 Dec 2022 18:10:21 +0000 Subject: [PATCH 2/5] add stream site --- hosts/leon/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hosts/leon/default.nix b/hosts/leon/default.nix index 90a3bb90..147c93a9 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -209,6 +209,14 @@ networking.wireguard.interfaces = { locations."/" = { proxyPass = "http://45.158.40.165:80"; proxyWebsockets = true; + }; + }; + virtualHosts."bicospacetech.stream.c3d2.de" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://10.10.11.4:14500"; + proxyWebsockets = true; }; }; virtualHosts."portainer.netlab.c3d2.de" = { From 0beda8f0e384d78c123c3fac8b5c44dc6036566e Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 7 Dec 2022 20:55:34 +0000 Subject: [PATCH 3/5] remove docker --- 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 337ced35..227ca659 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -32,7 +32,7 @@ nmap htop wireguard-tools - docker-compose + # docker-compose ]; users.users.leon-docker = { @@ -53,7 +53,7 @@ #>-----------------docker------------------------- - virtualisation.docker.enable = true; +# virtualisation.docker.enable = true; #<-----------------docker------------------------- From 78f5cb4feb64fe1d621c10d6ea88f927f1c50783 Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 7 Dec 2022 20:58:32 +0000 Subject: [PATCH 4/5] add docker and docker-compose --- 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 227ca659..337ced35 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -32,7 +32,7 @@ nmap htop wireguard-tools - # docker-compose + docker-compose ]; users.users.leon-docker = { @@ -53,7 +53,7 @@ #>-----------------docker------------------------- -# virtualisation.docker.enable = true; + virtualisation.docker.enable = true; #<-----------------docker------------------------- From 959a0931be9ce5dfd2a1bf95a8ca02d8287339d3 Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 10 Dec 2022 19:41:45 +0000 Subject: [PATCH 5/5] remove nginx --- hosts/leoncloud/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 337ced35..41e3f26c 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -110,25 +110,9 @@ 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";