Fix broken end-to-end test.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Dan Helfman 2020-11-18 14:20:07 -08:00
parent 97af16bd86
commit b619bde037
2 changed files with 5 additions and 4 deletions

View File

@ -28,10 +28,10 @@ map:
Paths to local or remote repositories (required). Tildes are Paths to local or remote repositories (required). Tildes are
expanded. Multiple repositories are backed up to in expanded. Multiple repositories are backed up to in
sequence. Borg placeholders can be used. See the output of sequence. Borg placeholders can be used. See the output of
"borg help placeholders" for details. "borg help placeholders" for details. See ssh_command for
See ssh_command for SSH options like identity file or port. SSH options like identity file or port. If systemd service
If systemd service is used, then add local repository paths is used, then add local repository paths in the systemd
in the systemd service file to the ReadWritePaths list. service file to the ReadWritePaths list.
example: example:
- user@backupserver:sourcehostname.borg - user@backupserver:sourcehostname.borg
- "user@backupserver:{fqdn}" - "user@backupserver:{fqdn}"

View File

@ -19,6 +19,7 @@ def generate_configuration(config_path, repository_path):
open(config_path) open(config_path)
.read() .read()
.replace('user@backupserver:sourcehostname.borg', repository_path) .replace('user@backupserver:sourcehostname.borg', repository_path)
.replace('- user@backupserver:{fqdn}', '')
.replace('- /home', '- {}'.format(config_path)) .replace('- /home', '- {}'.format(config_path))
.replace('- /etc', '') .replace('- /etc', '')
.replace('- /var/log/syslog*', '') .replace('- /var/log/syslog*', '')