diff --git a/machines/biblios/garage.nix b/machines/biblios/garage.nix index b7109c1..0e91378 100644 --- a/machines/biblios/garage.nix +++ b/machines/biblios/garage.nix @@ -53,7 +53,7 @@ in services.nginx.virtualHosts."cdn.luj.fr" = { enableACME = true; forceSSL = true; - serverAliases = [ "cdn.social.luj.fr" ]; + serverAliases = [ "luj.fr" ]; locations."/".extraConfig = '' proxy_pass http://127.0.0.1:3902; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -61,10 +61,10 @@ in ''; }; - machine.meta.zones."luj.fr".subdomains."social".subdomains."cdn".A = [ + machine.meta.zones."luj.fr".A = [ config.machine.meta.ips.public.ipv4 ]; - machine.meta.zones."luj.fr".subdomains."social".subdomains."cdn".AAAA = [ + machine.meta.zones."luj.fr".AAAA = [ config.machine.meta.ips.public.ipv6 ]; diff --git a/machines/gustave/default.nix b/machines/gustave/default.nix index 80bc592..9df1198 100644 --- a/machines/gustave/default.nix +++ b/machines/gustave/default.nix @@ -11,7 +11,8 @@ ./home-julien.nix ./nsd.nix ./borg.nix - ./pages.nix + # Performance is not as good as we expected, wait for pages v3 + # ./pages.nix ./readeck.nix ./plausible.nix ./nextcloud.nix @@ -25,6 +26,7 @@ profiles = with profiles; [ vm-simple-network server + behind-sniproxy ]; ips = { public.ipv4 = "82.67.34.230"; diff --git a/machines/gustave/nsd.nix b/machines/gustave/nsd.nix index 5eb5d5d..ef7d966 100644 --- a/machines/gustave/nsd.nix +++ b/machines/gustave/nsd.nix @@ -101,8 +101,6 @@ lib.mkMerge [ networking.firewall.allowedUDPPorts = [ 53 ]; networking.firewall.allowedTCPPorts = [ 53 ]; - machine.meta.zones."luj.fr".A = [ config.machine.meta.ips.public.ipv4 ]; - machine.meta.zones."luj.fr".AAAA = [ config.machine.meta.ips.public.ipv6 ]; machine.meta.zones."luj.fr".TXT = [ "homepage.luj.luj-static.page" ]; machine.meta.monitors = { diff --git a/machines/tower/forgejo-runner.nix b/machines/tower/forgejo-runner.nix index 6eda65a..f30cd01 100644 --- a/machines/tower/forgejo-runner.nix +++ b/machines/tower/forgejo-runner.nix @@ -20,6 +20,7 @@ bash coreutils curl + awscli2 ]; }; };