From 0d3223f7abcf11c687539d162050cbb67c6284fb Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 24 Jun 2024 19:57:28 +0900 Subject: [PATCH] Updates --- docs/setup.sh | 2 +- flake.nix | 2 +- nixos/hosts/frankfurt-linode-01/containers/derp.nix | 4 ++-- nixos/small.nix | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/setup.sh b/docs/setup.sh index 014e6ce6..672cb5fa 100755 --- a/docs/setup.sh +++ b/docs/setup.sh @@ -33,7 +33,7 @@ echo ">>> !!!!!" echo ">>> Setting up SSH Keys..... " ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -N "" echo "" >> ./keys/ssh/keys.txt -echo "# (`date`) `whoami`@`hostname`" >> ./keys/ssh/keys.txt +echo "# ($(date)) $(whoami)@$(hostname)" >> ./keys/ssh/keys.txt cat /home/albert/.ssh/id_ed25519.pub >> ./keys/ssh/keys.txt # Add all changes to git and and push diff --git a/flake.nix b/flake.nix index 9c9db564..5d6ddd01 100644 --- a/flake.nix +++ b/flake.nix @@ -85,7 +85,7 @@ deploy.nodes = { osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; }; milan-linode-01 = libx.deploy { hostname = "milan-linode-01"; }; - # frankfurt-linode-01 = libx.deploy { hostname = "frankfurt-linode-01"; }; + frankfurt-linode-01 = libx.deploy { hostname = "frankfurt-linode-01"; }; framework-server = libx.deploy { hostname = "framework-server"; }; # nuc-server = libx.deploy { hostname = "nuc-server"; }; diff --git a/nixos/hosts/frankfurt-linode-01/containers/derp.nix b/nixos/hosts/frankfurt-linode-01/containers/derp.nix index 77445c1f..a54261d0 100644 --- a/nixos/hosts/frankfurt-linode-01/containers/derp.nix +++ b/nixos/hosts/frankfurt-linode-01/containers/derp.nix @@ -19,8 +19,8 @@ }; volumes = [ "/var/run/tailscale/tailscaled.sock:/var/run/tailscale/tailscaled.sock:ro" - "/Storage/Data/Docker/sysctl.io/letsencrypt/external/certificates/certs/*.sysctl.io.crt:/app/certs/milan.sysctl.io.crt:ro" - "/Storage/Data/Docker/sysctl.io/letsencrypt/external/certificates/private/*.sysctl.io.key:/app/certs/milan.sysctl.io.key:ro" + "/Storage/Data/Docker/sysctl.io/letsencrypt/external/certificates/certs/*.sysctl.io.crt:/app/certs/frankfurt.sysctl.io.crt:ro" + "/Storage/Data/Docker/sysctl.io/letsencrypt/external/certificates/private/*.sysctl.io.key:/app/certs/frankfurt.sysctl.io.key:ro" ]; ports = [ "3478:3478/udp" diff --git a/nixos/small.nix b/nixos/small.nix index d76cb229..b9e3a8af 100644 --- a/nixos/small.nix +++ b/nixos/small.nix @@ -18,6 +18,7 @@ ./common/modules/networking.nix # Initial Networking configs ./common/modules/nixos.nix # Common NixOS Configurations ./common/modules/remote-builders.nix # Add remote builders + ./common/modules/hosts.nix # Adblockers ./users/${username} ./hosts/${hostname}