diff --git a/nixos/serverle/configuration.nix b/nixos/serverle/configuration.nix index 2106f2b..1ec9658 100644 --- a/nixos/serverle/configuration.nix +++ b/nixos/serverle/configuration.nix @@ -2,14 +2,14 @@ { imports = [ ./hardware-configuration.nix - ./disks.nix ./backup.nix + ./disks.nix + ./dyndns.nix ../modules/3d-printer.nix ../modules/avahi.nix ../modules/compression.nix ../modules/development.nix ../modules/docker.nix - ./dyndns.nix ../modules/networkdecrypt.nix ../modules/nix.nix ../modules/ssh.nix diff --git a/nixos/serverle/dyndns.nix b/nixos/serverle/dyndns.nix index 432a1a8..9296d00 100644 --- a/nixos/serverle/dyndns.nix +++ b/nixos/serverle/dyndns.nix @@ -1,14 +1,11 @@ { config, lib, pkgs, ... }: -let - cfg = import ./vars-dyndns.nix; -in { services.ddclient = { enable = true; - server = cfg.dyndns.server; - username = cfg.dyndns.username; + server = dyndns.inwx.com; + username = Stunkymonkey-dyndns; passwordFile = "/root/.dyndns_password"; - domains = cfg.dyndns.domains; + domains = [ "serverle.stunkymonkey.de" ]; ipv6 = true; }; } diff --git a/nixos/serverle/secrets.yaml b/nixos/serverle/secrets.yaml index 7c7160f..705dd7e 100644 --- a/nixos/serverle/secrets.yaml +++ b/nixos/serverle/secrets.yaml @@ -3,6 +3,7 @@ borgbackup_host: ENC[AES256_GCM,data:qYwTGE5kdp/jsKK8scVAUCXfOAi787lwiFB3VlntIg= borgbackup_dir: ENC[AES256_GCM,data:14thrxUMOl+2,iv:yjvQMCwcpN/AqbE/oLBNYbk3FpPHHibKZrxnK1gBdTY=,tag:CbEgg3WsNZ9MLw6iAMMW5A==,type:str] borgbackup_password: ENC[AES256_GCM,data:+i3uY8b5K558QD86dtuAmaIxHDbh0k8=,iv:dvhqQYKY9ZvZVKs/j3mD3mqF5B6IgSX2RCC14eOMxJc=,tag:X8gJU1iOQGQfjJh4MaRYQg==,type:str] borgbackup_private_ssh_key: ENC[AES256_GCM,data:WDVQaAmNMtZP99lCOpeMDnsL26gziDHlDDSnct7QXU9KgveNhDnnh4vGR/DaPlsnp76dVaNKf1vpspsJjtJ+BcEOg4SKU7xyODK5f5tglRJqapmTymASzERNF9joP8Py1lW15zlgGy4s/J9oAQ8gsfwy7aUGMlPr5xafHatbKPXiy+OnxekTTzT+H5eGaMl+q5nPKX8yOwnwBnPwp6DKvK+rTrqBptNsYBxw0MYgdEK1hW1YUxE9d4oZM3Mi7ggklK+ztspuXNpqkbogqc+1XIZN8vMaL9MK5zSJjuCw9lFYsfHctgiBlEuOy5Hn4tyEhu49uWVvoJLb+q7+gNJcbKBrisFd4c9fa7EnaQ4AenP2l1arZqlqjaqLNhD9FWI47o0neXe6TDAv1msIMXHibQVEVyNdktl6LBxQerXiGq33fWe3J5usaUFVi2N4sOF/Pn1Hta25OvuO2N2gUWh1bqi11wYzljS445LOOPBT3jkoceV2m+5R7fpF0soc/beKdj0dP6u5sfKbXFolHk1K,iv:4ZS/6PfyUwXlFaCYxpO0VkjBoH9zM9DJvF5I7fLYR+M=,tag:9m6RHNgr9TunQJp1Q5MqJA==,type:str] +initrd_ssk_key: ENC[AES256_GCM,data:G21oGK4o2M1l31EdH+ebvuQ/FErCW4kqCuAIkdLfPdkzHByBja22X4gadqwbMW43BxJ1aqlsPxO5l09ZRVnW4SY3Y2gAUQMgTUB58HgBr8m0a/48b6k7LXgLSbCasWnLCJ1e103+WaBar06DKL9EGO/+ckGRaoEE839tEksyKG+m/ijuk7F5jTiMIqkAloiqSp7UF85uNn6lytFZi2RVVJYbWjgRv6BpmgFlUnrEkWkwvF+dB61Lc+9uMOWMI2qCB8nJfiYrokxt6PNh7e1jN15vTJqWivkNwBl4gdesBzwRZIraHy8Q3m2Gl11g0Ai9x5GAFMQxzYMxIH/FTK5GlCi1mAqIX8vGp4nbuGUcbmt1jK9oLkVnRPg2u9G+qa8GduKfcDEWnIkepxNsR8aXolKGm+aDjD7pZFpJbn7YzzIgNXQBHvIcgL0DAYAaTPpZGno9gYFtqqlo9u2ltoha4nV8YpwrjJV4mTlswanSWNutWHLSuNDALvbzuFsjdXdJqKblXdeTk8h3i/eJx3pX,iv:vPOEYZGXyAlah8TRvRNQiI+rG5JZ+4//tCODeKS9XQE=,tag:mQM6R9a5iSYUBbAQC3KDEg==,type:str] sops: kms: [] gcp_kms: [] @@ -27,8 +28,8 @@ sops: SkFGQ04yWEhBY3FPSE5RaXZ6N1NmSUkKpLf4gOnPBx1ao5slYIfvK9sShRep2bqO IZvlGcsX1EHP0WB8XT1f9GUjBaEM1ZdIlXfaWRW2DDrDbgs+usQq2A== -----END AGE ENCRYPTED FILE----- - lastmodified: "2022-06-03T19:52:20Z" - mac: ENC[AES256_GCM,data:0TXzyknsWGQFRx1gEexioarG7UNynpVSV8wLG3wCr7ACDpXARYauj9knaksq+wi7/M3YJarZ9kHkPXUyQLdfpiss3su6DXc6XzJ8vJNUJ5tjUeMRD7SoAOBJyrO8N7/f9Jc79hGJvfyBC3yZBDloMnJ7fqiRCAwcrvja69aCgIQ=,iv:dnogW59lF+ycTRdRDJvOXTgMNhoEUNkKVqWcmMDtFC4=,tag:y3d/awlTl/Fj08SPhF1zgw==,type:str] + lastmodified: "2022-06-06T12:47:04Z" + mac: ENC[AES256_GCM,data:XQx8J0b8KDwek3WG10rBBD972y1KmFieZRvnLBIURiWOGp+M6haI44iVV1TKCfa9RRLMhhv1dn4KqHgZwQsDz1iuA9B48a9rFvEyaljD3DC9e89d92FSHpGM2+8ThSsLb9kCYRBHQ3piut9YFbq+CSnyCJ1I9x4tgbcw/NqWsjk=,iv:sD+QhkIQMoZhqG//7zBf9/wXl3fxwYG/JFE/VtF65OA=,tag:F+37as3mSR/sjCYpmcopbg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.7.3 diff --git a/nixos/serverle/vars-dyndns.nix b/nixos/serverle/vars-dyndns.nix deleted file mode 100644 index f74abea..0000000 --- a/nixos/serverle/vars-dyndns.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - dyndns = { - server = "dyndns.inwx.com"; - username = "Stunkymonkey-dyndns"; - domains = [ "serverle.stunkymonkey.de" ]; - }; -}