diff --git a/configuration/common/backup.nix b/configuration/common/backup.nix index 7cb500f..2cdf77a 100644 --- a/configuration/common/backup.nix +++ b/configuration/common/backup.nix @@ -4,8 +4,8 @@ clerie.backup = { targets = { - cyan.serverName = "cyan.backup.clerie.de"; - magenta.serverName = "magenta.backup.clerie.de"; + cyan.serverUrl = "https://cyan.backup.clerie.de"; + magenta.serverUrl = "https://magenta.backup.clerie.de"; }; }; diff --git a/hosts/nonat/configuration.nix b/hosts/nonat/configuration.nix index 5bddcb6..47d7495 100644 --- a/hosts/nonat/configuration.nix +++ b/hosts/nonat/configuration.nix @@ -23,7 +23,6 @@ { Gateway = "2001:638:904:ffca::1"; } ]; linkConfig.RequiredForOnline = "routable"; - ipv6AcceptRAConfig.DHCPv6Client = "no"; }; systemd.network.networks."10-nat-netz-mercury" = { matchConfig.Name = "ens19"; @@ -31,7 +30,6 @@ "192.168.10.1/24" ]; linkConfig.RequiredForOnline = "no"; - ipv6AcceptRAConfig.DHCPv6Client = "no"; }; networking.nat = { diff --git a/modules/backup/default.nix b/modules/backup/default.nix index cea7ca9..9cc552d 100644 --- a/modules/backup/default.nix +++ b/modules/backup/default.nix @@ -64,7 +64,7 @@ let targetUsername = if targetOptions.username == null then config.networking.hostName else targetOptions.username; in { "clerie-backup/${jobName}-${targetName}/repo_password".source = jobPasswordFile; - "clerie-backup/${jobName}-${targetName}/repo_url".text = "https://${targetOptions.serverName}${repoPath}"; + "clerie-backup/${jobName}-${targetName}/repo_url".text = "${targetOptions.serverUrl}${repoPath}"; "clerie-backup/${jobName}-${targetName}/auth_username".text = targetUsername; "clerie-backup/${jobName}-${targetName}/auth_password".source = targetPasswordFile; "clerie-backup/${jobName}-${targetName}/files".text = concatStringsSep "\n" jobOptions.paths; @@ -82,7 +82,7 @@ let type = with types; nullOr str; default = null; }; - serverName = mkOption { + serverUrl = mkOption { type = types.str; }; };