diff options
| author | Mel <mel@rnrd.eu> | 2025-04-16 12:56:23 +0200 |
|---|---|---|
| committer | Mel <mel@rnrd.eu> | 2025-04-16 12:56:23 +0200 |
| commit | 22eb149ed7e337fb49eca779e9f7b8fc1600d823 (patch) | |
| tree | 68678cffcf27fb3490966e04902d6342d9a143dc | |
| parent | 5e1a9f0179c0beb73b63140a3ee20c4acb04fcc4 (diff) | |
| download | network-22eb149ed7e337fb49eca779e9f7b8fc1600d823.tar.zst network-22eb149ed7e337fb49eca779e9f7b8fc1600d823.zip | |
Configure foundation WWW for all machines
Signed-off-by: Mel <mel@rnrd.eu>
| -rw-r--r-- | machines/corsac/default.nix | 22 | ||||
| -rw-r--r-- | machines/lapin/default.nix | 24 | ||||
| -rw-r--r-- | machines/renard/default.nix | 30 |
3 files changed, 59 insertions, 17 deletions
diff --git a/machines/corsac/default.nix b/machines/corsac/default.nix index d030b31..c3d7d85 100644 --- a/machines/corsac/default.nix +++ b/machines/corsac/default.nix @@ -7,7 +7,6 @@ ./hardware.nix ./devices.nix - ../../modules/www ../../modules/dns.nix ../../modules/ddns.nix ../../modules/nfs.nix @@ -18,9 +17,24 @@ ../../services/transmission.nix ]; - foundation.monitoring = { - client.enable = true; - services = [ "base" "dns" "home" "jellyfin" "immich" ]; + foundation = { + www = { + enable = true; + + public = true; + tailnet = true; + }; + + monitoring = { + client.enable = true; + services = [ + "base" + "dns" + "home" + "jellyfin" + "immich" + ]; + }; }; system.stateVersion = "24.05"; diff --git a/machines/lapin/default.nix b/machines/lapin/default.nix index 4940df6..07114e5 100644 --- a/machines/lapin/default.nix +++ b/machines/lapin/default.nix @@ -1,4 +1,4 @@ -{ me, config, ... }: +{ ... }: { imports = [ @@ -7,16 +7,28 @@ ./hardware.nix ./devices.nix - ../../modules/www - ../../services/conduwuit.nix ../../services/pds.nix ../../services/akkoma ]; - foundation.monitoring = { - client.enable = true; - services = [ "base" "akkoma" "pds" "conduwuit" ]; + foundation = { + www = { + enable = true; + + public = true; + tailnet = true; + }; + + monitoring = { + client.enable = true; + services = [ + "base" + "akkoma" + "pds" + "conduwuit" + ]; + }; }; system.stateVersion = "23.05"; diff --git a/machines/renard/default.nix b/machines/renard/default.nix index f56c2f5..aed4b2e 100644 --- a/machines/renard/default.nix +++ b/machines/renard/default.nix @@ -7,7 +7,6 @@ ./hardware.nix ./devices.nix - ../../modules/www ../../modules/binary-cache.nix ../../modules/git.nix ../../modules/syncthing.nix @@ -19,15 +18,32 @@ ../../services/irc ]; - foundation.monitoring = { - server = { + foundation = { + www = { enable = true; - hosts = map (m: { - inherit (m) name; inherit (m.tailscale) ip; - }) machines; + + public = true; + tailnet = true; }; - services = [ "base" "tailnet" "cache" "git" "mel" "shorest" ]; + monitoring = { + server = { + enable = true; + hosts = map (m: { + inherit (m) name; + inherit (m.tailscale) ip; + }) machines; + }; + + services = [ + "base" + "tailnet" + "cache" + "git" + "mel" + "shorest" + ]; + }; }; services.nginx.virtualHosts = { |