centralise tailscale domain
5 files changed, 18 insertions(+), 18 deletions(-)
M system/roles/git-server.nix → system/roles/git-server.nix
@@ -13,11 +13,10 @@ concatMapAttrs mapAttrsToList ; inherit (import ../../lib/caddy.nix { inherit lib; }) security-headers; + data = import ../../data; hostname = config.networking.hostName; - domain = "alin.ovh"; - ts-domain = "fin-marlin.ts.net"; - serverName = "git.${domain}"; + serverName = "git.${data.pubnet}"; gitoliteCfg = config.services.gitolite; repos = "${gitoliteCfg.dataDir}/repositories";@@ -213,8 +212,8 @@ openssh ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${lib.getExe pkgs.rdiff-backup} --api-version 201 backup ${config.services.gitolite.dataDir} ${hostname}@r5.${ts-domain}::gitolite"; - ExecStartPost = "-${lib.getExe pkgs.rdiff-backup} --api-version 201 remove increments --older-than 3M ${hostname}@r5.${ts-domain}::gitolite"; + ExecStart = "${lib.getExe pkgs.rdiff-backup} --api-version 201 backup ${config.services.gitolite.dataDir} ${hostname}@r5.${data.tailnet}::gitolite"; + ExecStartPost = "-${lib.getExe pkgs.rdiff-backup} --api-version 201 remove increments --older-than 3M ${hostname}@r5.${data.tailnet}::gitolite"; }; }; };
M system/roles/paperless.nix → system/roles/paperless.nix
@@ -3,8 +3,8 @@ config, ... }: let + data = import ../../data; cfg = config.services.paperless; - ts-domain = "fin-marlin.ts.net"; in { age.secrets = {@@ -31,7 +31,7 @@ settings = { PAPERLESS_DBENGINE = "sqlite"; PAPERLESS_TIME_ZONE = config.time.timeZone; - PAPERLESS_URL = "https://papers.${ts-domain}"; + PAPERLESS_URL = "https://papers.${data.tailnet}"; PAPERLESS_TRUSTED_PROXIES = "::1"; PAPERLESS_USE_X_FORWARD_HOST = true; PAPERLESS_USE_X_FORWARD_PORT = true;@@ -65,7 +65,7 @@ }; }; services.caddy.virtualHosts = { - "papers.${ts-domain}" = { + "papers.${data.tailnet}" = { extraConfig = '' bind tailscale/papers tailscale_auth
M system/roles/readeck.nix → system/roles/readeck.nix
@@ -3,8 +3,7 @@ config, ... }: let - domain = config.networking.domain; - ts-domain = "fin-marlin.ts.net"; + data = import ../../data; in { age.secrets.readeck.file = ../../secrets/readeck.age;@@ -15,13 +14,13 @@ environmentFile = config.age.secrets.readeck.path; settings = { server = { host = "unix:/run/web/readeck.sock?mode=0660"; - base_url = "https://read.${ts-domain}"; + base_url = "https://read.${data.tailnet}"; }; email = { host = "localhost"; port = 587; - from = "readeck@${domain}"; - from_noreply = "noreply+readeck@${domain}"; + from = "readeck@${data.pubnet}"; + from_noreply = "noreply+readeck@${data.pubnet}"; }; auth.forwarded = { enabled = true;@@ -33,7 +32,7 @@ }; }; services.caddy.virtualHosts = { - "read.${ts-domain}" = { + "read.${data.tailnet}" = { extraConfig = '' bind tailscale/read tls {
M system/settings/services/tailscale.nix → system/settings/services/tailscale.nix
@@ -1,10 +1,9 @@ { - config, - lib, ... }: let - tailnet = "fin-marlin.ts.net"; + data = import ../../../data; + inherit (data) tailnet; magicDNSv6 = "fd7a:115c:a1e0::53"; in {
M user/settings/ssh.nix → user/settings/ssh.nix
@@ -1,4 +1,7 @@ { ... }: +let + data = import ../../data; +in { programs.ssh = { enable = true;@@ -15,7 +18,7 @@ VerifyHostKeyDNS ask CanonicalizeHostname yes CanonicalizeFallbackLocal no CanonicalizeMaxDots 0 - CanonicalDomains home.arpa fin-marlin.ts.net + CanonicalDomains ${data.homenet} ${data.tailnet} IdentitiesOnly yes StrictHostKeyChecking yes '';