1
0

Update from updated-inputs-2025-04-17-01-03

This commit is contained in:
Flake Update Bot
2025-04-17 03:03:08 +02:00
3 changed files with 4 additions and 6 deletions
configuration/common
hosts/nonat
modules/backup

@ -4,8 +4,8 @@
clerie.backup = { clerie.backup = {
targets = { targets = {
cyan.serverName = "cyan.backup.clerie.de"; cyan.serverUrl = "https://cyan.backup.clerie.de";
magenta.serverName = "magenta.backup.clerie.de"; magenta.serverUrl = "https://magenta.backup.clerie.de";
}; };
}; };

@ -23,7 +23,6 @@
{ Gateway = "2001:638:904:ffca::1"; } { Gateway = "2001:638:904:ffca::1"; }
]; ];
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
ipv6AcceptRAConfig.DHCPv6Client = "no";
}; };
systemd.network.networks."10-nat-netz-mercury" = { systemd.network.networks."10-nat-netz-mercury" = {
matchConfig.Name = "ens19"; matchConfig.Name = "ens19";
@ -31,7 +30,6 @@
"192.168.10.1/24" "192.168.10.1/24"
]; ];
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = "no";
ipv6AcceptRAConfig.DHCPv6Client = "no";
}; };
networking.nat = { networking.nat = {

@ -64,7 +64,7 @@ let
targetUsername = if targetOptions.username == null then config.networking.hostName else targetOptions.username; targetUsername = if targetOptions.username == null then config.networking.hostName else targetOptions.username;
in { in {
"clerie-backup/${jobName}-${targetName}/repo_password".source = jobPasswordFile; "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_username".text = targetUsername;
"clerie-backup/${jobName}-${targetName}/auth_password".source = targetPasswordFile; "clerie-backup/${jobName}-${targetName}/auth_password".source = targetPasswordFile;
"clerie-backup/${jobName}-${targetName}/files".text = concatStringsSep "\n" jobOptions.paths; "clerie-backup/${jobName}-${targetName}/files".text = concatStringsSep "\n" jobOptions.paths;
@ -82,7 +82,7 @@ let
type = with types; nullOr str; type = with types; nullOr str;
default = null; default = null;
}; };
serverName = mkOption { serverUrl = mkOption {
type = types.str; type = types.str;
}; };
}; };