bundles/backup-client: support using a non-standard ssh port

bundles/backup-client/files/generate-backup

@@ -13,7 +13,7 @@ rsync_errors=""
 % for path in sorted(paths):
 rsync -zaAP --numeric-ids --delete --relative \
     --rsync-path="/usr/bin/rsync --fake-super" \
-    -e "ssh -o IdentityFile=/etc/backup.priv -o StrictHostKeyChecking=accept-new" \
+    -e "ssh -o IdentityFile=/etc/backup.priv -o StrictHostKeyChecking=accept-new -p ${port}" \
     "${path}" "$ssh_login":backups/
 
 exitcode=$?

bundles/backup-client/items.py

@@ -7,12 +7,19 @@ if node.metadata['backups'].get('exclude_from_backups', False):
         },
     }
 else:
+    if ':' in node.metadata['backup-client']['server']:
+        server, port = node.metadata['backup-client']['server'].split(':')
+    else:
+        server = node.metadata['backup-client']['server']
+        port = 22
+
     files = {
         '/usr/local/bin/generate-backup': {
             'content_type': 'mako',
             'context': {
                 'username': node.metadata['backup-client']['user-name'],
-                'server': node.metadata['backup-client']['server'],
+                'server': server,
+                'port': port,
                 'paths': node.metadata.get('backups', {}).get('paths', {}),
             },
             'mode': '0700',

groups/all.py

@@ -25,7 +25,7 @@ groups['all'] = {
             },
         },
         'backup-client': {
-            'server': 'franzi-home.kunbox.net',
+            'server': 'franzi-home.kunbox.net:2022',
         },
     },
     'pip_command': 'pip3',

groups/locations.py

@@ -60,7 +60,7 @@ groups['home'] = {
             'relayhost': '[mx0.kunbox.net]:2525',
         },
         'backup-client': {
-            'server': '172.19.138.20',
+            'server': '172.19.138.20:22',
         },
     },
 }