modules/backup: Specify backup server as full URL
This commit is contained in:
parent
c0a8f8116e
commit
fed00bd41b
@ -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";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -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;
|
||||
};
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user