diff --git a/nodes.py b/nodes.py index 78e2fa1..5c7df96 100644 --- a/nodes.py +++ b/nodes.py @@ -1,7 +1,7 @@ bws = libs.bwsops.BwSops("secrets.json") uberspaceify = libs.uberspace.Uberspaceify() -def generate_default_repos(node_name): +def generate_default_repos(node_name, username): return { "main-cyan": { "repo_password": bws.get([node_name, "clerie-backup-job-main"]), @@ -9,8 +9,8 @@ def generate_default_repos(node_name): "auth_username": node_name, "auth_password": bws.get([node_name, "clerie-backup-target-cyan"]), "files": [ - "/home/clerie", - "/var/www/virtual/clerie", + f"/home/{username}", + f"/var/www/virtual/{username}", ], }, "main-magenta": { @@ -19,8 +19,8 @@ def generate_default_repos(node_name): "auth_username": node_name, "auth_password": bws.get([node_name, "clerie-backup-target-magenta"]), "files": [ - "/home/clerie", - "/var/www/virtual/clerie", + f"/home/{username}", + f"/var/www/virtual/{username}", ], }, } @@ -34,7 +34,7 @@ nodes = uberspaceify.nodes({ ), "metadata": { "clerie-backup": { - "repos": generate_default_repos("clerie.uber.space"), + "repos": generate_default_repos("clerie.uber.space", "clerie"), }, "cron": { "jobs": { @@ -54,7 +54,7 @@ nodes = uberspaceify.nodes({ ), "metadata": { "clerie-backup": { - "repos": generate_default_repos("cleriewi.uber.space"), + "repos": generate_default_repos("cleriewi.uber.space", "cleriewi"), }, "cron": { "jobs": {