diff --git a/hosts/jupiter-vps/default.nix b/hosts/jupiter-vps/default.nix index 722d364..674cf4b 100644 --- a/hosts/jupiter-vps/default.nix +++ b/hosts/jupiter-vps/default.nix @@ -35,7 +35,7 @@ networking = { hostName = "jupiter-vps"; - publicIPv4 = "51.75.170.190"; + publicIPv4 = "217.154.55.15"; }; environment.impermanence.enable = lib.mkForce false; diff --git a/hosts/jupiter-vps/format.nix b/hosts/jupiter-vps/format.nix index 7a5b4d7..7d31d30 100644 --- a/hosts/jupiter-vps/format.nix +++ b/hosts/jupiter-vps/format.nix @@ -1,7 +1,7 @@ { disko.devices = { disk.main = { - device = "/dev/sda"; + device = "/dev/vda"; type = "disk"; content = { type = "gpt"; diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix index 30e9a3a..636019f 100644 --- a/hosts/jupiter/default.nix +++ b/hosts/jupiter/default.nix @@ -54,7 +54,7 @@ networking = { hostName = "jupiter"; - publicIPv4 = "51.89.210.124"; + publicIPv4 = "87.106.36.59"; }; boot.initrd = { diff --git a/hosts/jupiter/users/storm/configs/console/podman/blog/default.nix b/hosts/jupiter/users/storm/configs/console/podman/blog/default.nix index bf5846d..cf0fe43 100644 --- a/hosts/jupiter/users/storm/configs/console/podman/blog/default.nix +++ b/hosts/jupiter/users/storm/configs/console/podman/blog/default.nix @@ -31,6 +31,14 @@ in labels = [ "traefik.enable=true" "traefik.http.routers.blog.rule=Host(`blog.karaolidis.com`)" + + "traefik.http.routers.root.rule=Host(`karaolidis.com`) || Host(`www.karaolidis.com`)" + "traefik.http.routers.root.middlewares=redirect-root-to-blog" + "traefik.http.routers.root.service=noop@internal" + + "traefik.http.middlewares.redirect-root-to-blog.redirectregex.regex=^https://(www\.)?karaolidis\.com(/.*)?$" + "traefik.http.middlewares.redirect-root-to-blog.redirectregex.replacement=https://blog.karaolidis.com$${2}" + "traefik.http.middlewares.redirect-root-to-blog.redirectregex.permanent=false" ]; }; @@ -47,10 +55,6 @@ in labels = [ "traefik.enable=true" "traefik.http.routers.blog-receiver.rule=Host(`blog.karaolidis.com`) && PathPrefix(`/upload`)" - - "traefik.http.middlewares.redirect-root-to-blog.redirectregex.regex=^https://(www\.)?karaolidis\.com(/.*)?$" - "traefik.http.middlewares.redirect-root-to-blog.redirectregex.replacement=https://blog.karaolidis.com$${2}" - "traefik.http.middlewares.redirect-root-to-blog.redirectregex.permanent=false" ]; };