diff --git a/configs/nixos/ni/modules/services/dns-server/default.nix b/configs/nixos/ni/modules/services/dns-server/default.nix index 438cdc85..1ae536fd 100644 --- a/configs/nixos/ni/modules/services/dns-server/default.nix +++ b/configs/nixos/ni/modules/services/dns-server/default.nix @@ -18,7 +18,7 @@ in $ORIGIN foodogsquared.internal. $TTL 3600 - @ IN SOA ns1.foodogsquared.internal. admin@foodogsquared.one. ( + @ IN SOA ns1.foodogsquared.internal. admin.foodogsquared.one. ( 2025010101 ;Serial 3600 ;Refresh 3600 ;Retry @@ -27,16 +27,13 @@ in ) 3600 IN NS ns1.foodogsquared.internal. - ni 3600 IN A 127.0.0.1. - ns1 3600 IN A 127.0.0.1. - rss 3600 IN A 127.0.0.1. + ni 3600 IN A 127.0.0.1 + ns1 3600 IN A 127.0.0.1 + rss 3600 IN A 127.0.0.1 ''; }; - security.ipa = { - enable = true; - domain = "foodogsquared.internal"; - dyndns.enable = true; - }; + services.resolved.domains = [ "~foodogsquared.internal" ]; + networking.nameservers = [ "127.0.0.1" ]; }; } diff --git a/configs/nixos/ni/modules/services/download-media/default.nix b/configs/nixos/ni/modules/services/download-media/default.nix index 70cbcd8d..589b57d3 100644 --- a/configs/nixos/ni/modules/services/download-media/default.nix +++ b/configs/nixos/ni/modules/services/download-media/default.nix @@ -65,8 +65,6 @@ in # We're putting as a separate config file instead of configuring it # in the service properly since secrets decrypted by sops-nix cannot # be read in Nix. - "--config" - "${config.sops.secrets."${pathPrefix}/secrets-config".path}" ]; # Given an attribute set of jobs that contains a list of objects with @@ -98,11 +96,6 @@ in lib.listToAttrs jobsList; in { - sops.secrets = getSecrets ./secrets.yaml - (attachSopsPathPrefix pathPrefix { - "secrets-config" = { }; - }); - suites.filesystem.setups.archive.enable = true; services.yt-dlp = { diff --git a/configs/nixos/ni/modules/services/rss-reader/default.nix b/configs/nixos/ni/modules/services/rss-reader/default.nix index dd3bbb87..aea29974 100644 --- a/configs/nixos/ni/modules/services/rss-reader/default.nix +++ b/configs/nixos/ni/modules/services/rss-reader/default.nix @@ -22,12 +22,12 @@ in adminCredentialsFile = config.sops.secrets."miniflux/admin".path; config = { LISTEN_ADDR = "127.0.0.1:${builtins.toString port}"; - BASE_URL = "http://rss.ni.internal"; + BASE_URL = "http://rss.ni.local"; }; }; - services.nginx.virtualHosts."rss.ni.internal" = { - locations."/".proxyPass = "http://localhost:${builtins.toString port}"; + services.nginx.virtualHosts."rss.ni.local" = { + locations."/".proxyPass = "http://ni.local:${builtins.toString port}"; }; }; }