From 8c1b350f1af9322232b7e322d790422603b30e56 Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 14:53:02 +0000 Subject: [PATCH 1/9] update --- hosts/leoncloud/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 55f691b6..01fe25fb 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -9,7 +9,6 @@ nix.settings.auto-optimise-store = lib.mkForce false; - networking = { hostName = "leoncloud"; firewall.enable = true; @@ -110,7 +109,7 @@ services.nextcloud = { after = ["postgresql.service"]; }; - services.nginx.virtualHosts."localhost".listen = [ { addr = "127.0.0.1"; port = 8080; } ]; +# services.nginx.virtualHosts."localhost".listen = [ { addr = "127.0.0.1"; port = 8080; } ]; #<-----------------nextcloud---------------------- From 966bb7389f6c1bc753bcb8fcd1188b6151d7cd30 Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 14:56:10 +0000 Subject: [PATCH 2/9] update --- hosts/leoncloud/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 01fe25fb..df73b59c 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -38,8 +38,11 @@ isNormalUser = true; extraGroups = [ "wheel" "docker" ]; createHome = true; - openssh.authorizedKeys.keys = with import ../../users.nix; - leon.sshKeys; + openssh.authorizedKeys.keys = + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air" + + #with import ../../users.nix; + # leon.sshKeys; }; From dadf8c72c718e3b5c635b8686d8e9692f6bd266a Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 14:58:23 +0000 Subject: [PATCH 3/9] update --- hosts/leoncloud/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index df73b59c..954b7540 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -38,12 +38,10 @@ isNormalUser = true; extraGroups = [ "wheel" "docker" ]; createHome = true; - openssh.authorizedKeys.keys = - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air" - - #with import ../../users.nix; - # leon.sshKeys; - }; + # openssh.authorizedKeys.keys = with import ../../users.nix; + # leon.sshKeys; + openssh.authorizedKeys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air"; +}; # enable IP routing From 6bc6834498a284d67aef8b2ea5bb7d84ede35360 Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 14:58:50 +0000 Subject: [PATCH 4/9] 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 954b7540..29a3b8c1 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -40,7 +40,7 @@ createHome = true; # openssh.authorizedKeys.keys = with import ../../users.nix; # leon.sshKeys; - openssh.authorizedKeys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air"; + openssh.authorizedKeys.keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air"; }; From e141ce6ee02f5567fd364fcc1dea92286d373dda Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 14:59:39 +0000 Subject: [PATCH 5/9] update --- hosts/leoncloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/leoncloud/default.nix b/hosts/leoncloud/default.nix index 29a3b8c1..0664ac3a 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -28,6 +28,7 @@ vim python3Full python310Packages.pip + python310Packages.flask nmap htop wireguard-tools @@ -38,9 +39,8 @@ isNormalUser = true; extraGroups = [ "wheel" "docker" ]; createHome = true; - # openssh.authorizedKeys.keys = with import ../../users.nix; - # leon.sshKeys; - openssh.authorizedKeys.keys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air"; + openssh.authorizedKeys.keys = with import ../../users.nix; + leon.sshKeys; }; From b70d9bcb78f5caf72a7ac289b8227dff3fcaa7e1 Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 17:30:36 +0000 Subject: [PATCH 6/9] update --- 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 ca0e295a..9e6f5dc0 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -57,7 +57,6 @@ virtualisation.docker.enable = true; - users.users.leon = { isNormalUser = true; extraGroups = [ "wheel" "docker" ]; @@ -208,7 +207,7 @@ networking.wireguard.interfaces = { forceSSL = true; enableACME = true; locations."/" = { - proxyPass = "http://10.10.11.2:2500"; + proxyPass = "http://10.10.11.4:80"; proxyWebsockets = true; }; }; From 97b7d2d71f814aac2b5a7e981af0d4113aece062 Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 17:34:22 +0000 Subject: [PATCH 7/9] 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 9e6f5dc0..8eba7880 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -203,7 +203,7 @@ networking.wireguard.interfaces = { proxyWebsockets = true; }; }; - virtualHosts."cloud.bicospacetech.c3d2.de" = { + virtualHosts."bicospacetech.cloud.c3d2.de" = { forceSSL = true; enableACME = true; locations."/" = { From b53c53a6f7a0a1e0cfc73917183c434c19b0e1ff Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 17:37:34 +0000 Subject: [PATCH 8/9] 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 0664ac3a..e94ba0f3 100644 --- a/hosts/leoncloud/default.nix +++ b/hosts/leoncloud/default.nix @@ -89,7 +89,7 @@ services.nextcloud = { dbname = "nextcloud"; adminpassFile = "/etc/nixos/next-cloud/pass"; adminuser = "root"; - extraTrustedDomains = ["45.158.40.165" "172.20.79.254" "10.10.11.4" "10.10.11.1" ]; + extraTrustedDomains = ["10.10.11.4" "10.10.11.1" "bicospacetech.cloud.c3d2.de"]; }; }; From 4f785ca1c98cffdcdb4a0824d545fb0a8559056d Mon Sep 17 00:00:00 2001 From: leon Date: Sat, 26 Nov 2022 21:28:30 +0000 Subject: [PATCH 9/9] 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 8eba7880..e2fc50a3 100644 --- a/hosts/leon/default.nix +++ b/hosts/leon/default.nix @@ -52,7 +52,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - wget vim python3Full python310Packages.pip nmap htop wireguard-tools docker-compose + wget vim python3Full python310Packages.pip python310Packages.flask nmap htop wireguard-tools docker-compose ]; virtualisation.docker.enable = true;