diff --git a/machines/hippocampus/servers/private.nix b/machines/hippocampus/servers/private.nix index 45f8056..3d4eed3 100644 --- a/machines/hippocampus/servers/private.nix +++ b/machines/hippocampus/servers/private.nix @@ -13,15 +13,15 @@ # ./private/grafana.nix # Home Monitoring and Control - ./private/homeassistant.nix + # ./private/homeassistant.nix # Minio S3 Object Storage ./private/miniio.nix # OctoPrint - ./private/octoprint.nix + # ./private/octoprint.nix # Samba Share - ./private/samba.nix + # ./private/samba.nix ]; } diff --git a/machines/hippocampus/servers/public.nix b/machines/hippocampus/servers/public.nix index f711dd3..1f53649 100644 --- a/machines/hippocampus/servers/public.nix +++ b/machines/hippocampus/servers/public.nix @@ -6,9 +6,6 @@ # Entrace to Control Pane of Private Network ./public/headscale.nix - # Location tracking of my Dad in Saskatchewan - ./public/hauk.nix - # Self Hosted Git Server ./public/gitea.nix diff --git a/machines/hippocampus/servers/public/hauk.nix b/machines/hippocampus/servers/public/hauk.nix deleted file mode 100644 index 775f305..0000000 --- a/machines/hippocampus/servers/public/hauk.nix +++ /dev/null @@ -1,14 +0,0 @@ -{pkgs, config, ...}: - -{ - imports = [ - ../../oci/hauk.nix - ]; - services.caddy.virtualHosts = { - "crompton.cc" = { - extraConfig = '' - reverse_proxy 127.0.0.1:7888 - ''; - }; - }; -} diff --git a/machines/hippocampus/servers/public/headscale.nix b/machines/hippocampus/servers/public/headscale.nix index ef89e96..5da725a 100644 --- a/machines/hippocampus/servers/public/headscale.nix +++ b/machines/hippocampus/servers/public/headscale.nix @@ -23,7 +23,7 @@ ]; # Give a name to each device - dns_config = { + dns = { base_domain = "tailnet"; magic_dns = true; }; diff --git a/machines/hippocampus/servers/public/pterodactyl.nix b/machines/hippocampus/servers/public/pterodactyl.nix index b1be04d..f2deca9 100644 --- a/machines/hippocampus/servers/public/pterodactyl.nix +++ b/machines/hippocampus/servers/public/pterodactyl.nix @@ -52,11 +52,17 @@ }; services.caddy.virtualHosts = { "games.syzygial.cc:443" = { + serverAliases = [ + "games.crompton.cc:443" + ]; extraConfig = '' reverse_proxy 10.1.0.1:80 ''; }; "games.syzygial.cc:9000" = { + serverAliases = [ + "games.crompton.cc:9000" + ]; extraConfig = '' reverse_proxy 10.1.0.1:9000 ''; diff --git a/machines/hippocampus/servers/public/syzygial.nix b/machines/hippocampus/servers/public/syzygial.nix index 23bc1b7..537dd8f 100644 --- a/machines/hippocampus/servers/public/syzygial.nix +++ b/machines/hippocampus/servers/public/syzygial.nix @@ -10,5 +10,12 @@ } ''; }; + "crompton.cc" = { + extraConfig = '' + file_server { + root /srv/www/crompton + } + ''; + }; }; }