diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/ganymede/caddy.nix | 4 | ||||
| -rw-r--r-- | hosts/mercury/nixos.nix | 22 | ||||
| -rw-r--r-- | hosts/mercury/wireguard.nix | 1 |
3 files changed, 19 insertions, 8 deletions
diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix index cf85042..0fe2175 100644 --- a/hosts/ganymede/caddy.nix +++ b/hosts/ganymede/caddy.nix @@ -36,12 +36,12 @@ ''; virtualHosts = { - "jta.williamsfam.us.com" = { + "questions.williamsfam.us.com" = { logFormat = lib.mkForce '' output file /var/log/caddy/access-williamsfam.us.com.log ''; extraConfig = '' - root * /media/public/www/jta + root * /media/public/www/questions @hidden path */.* respond @hidden "Not Found" 404 diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 87c0495..ff386cd 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -1,6 +1,7 @@ { inputs, hosts, + lib, ... }: { imports = [ @@ -17,11 +18,22 @@ services.upower.enable = true; - programs.ssh.extraConfig = '' - Host ganymede - HostName 10.100.0.1 - Port 22 - ''; + programs.ssh.extraConfig = + hosts + |> (lib.mapAttrsToList (hostname: hostAttrs: + if hostAttrs ? ip + then '' + Host ${hostname} + ${ + if hostAttrs ? jump + then "ProxyJump ${hostAttrs.jump}" + else "" + } + HostName ${hostAttrs.ip} + '' + else "")) + |> (builtins.filter (s: s != "")) + |> (lib.concatStringsSep "\n"); programs.kdeconnect.enable = true; diff --git a/hosts/mercury/wireguard.nix b/hosts/mercury/wireguard.nix index a103328..f8b1bd8 100644 --- a/hosts/mercury/wireguard.nix +++ b/hosts/mercury/wireguard.nix @@ -42,7 +42,6 @@ in { wants = ["network-online.target"]; script = '' REMOTE_IP=$(${pkgs.dnsutils}/bin/dig +short williamsfam.us.com | ${pkgs.gawk}/bin/awk 'NR==1') - if [[ -z "$REMOTE_IP" ]]; then echo "Failed to resolve DNS for configured domain" >&2 exit 1 |