From fed00bd41b6218ff505f8a30d6e6576e052f02c0 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Wed, 16 Apr 2025 22:03:38 +0200
Subject: [PATCH] modules/backup: Specify backup server as full URL
---
configuration/common/backup.nix | 4 ++--
modules/backup/default.nix | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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/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;
};
};