Add ability to use none standart ssh port for connections and Fix bugs

defaults/main.yml

@@ -20,7 +20,7 @@ borgbackup_server_group: "borgbackup"
 borgbackup_server_home: "/srv/borgbackup"
 borgbackup_server_pool: "{{ borgbackup_server_home }}/repos"
 
-# if necessary, specify a password for the backup server in order to 
+# if necessary, specify a password for the backup server in order to
 # add the client ssh key to the backup server's authorized keys
 # borgbackup_server_password: "{{ vault_borgbackup_server_password }}"
 
@@ -34,6 +34,8 @@ borgbackup_passphrase: "{{ vault_borgbackup_passphrase }}"
 ## borg client configuration
 ##
 borgbackup_client: False
+# SSH server port
+borgbackup_client_backup_server_port: 22
 
 # Specify the SSH private key type to use. By default role will generate
 # ED25519 keys if they are supported by the remote host, otherwise RSA keys
@@ -55,7 +57,7 @@ borgbackup_client_lastlog_dir: "/var/log/borg"
 # max retry attempt on create/prune/check task failure. only one attempt if unset.
 #borgbackup_task_retry: 3
 
-# retry attempt wait time 
+# retry attempt wait time
 #borgbackup_task_retry_wait: 30
 
 # borgbackup jobs examples :
@@ -84,4 +86,4 @@ borgbackup_check_enabled: yes
 #     check_options: "--lock-wait 28800"
 #     day: "*"
 #     hour: 4
-#     minute: 0
+#     minute: 0

tasks/borgbackup_client.yml

@@ -23,21 +23,17 @@
 
 - name: add ssh-pubkey to backup server
   vars:
-    ansible_become_pass: "{{ borgbackup_server_password | default(ansible_become_password) }}"
+    ansible_become_pass: "{{ borgbackup_server_password | default('') }}"
   delegate_to: "{{ borgbackup_client_backup_server }}"
-  # Start the delegate from the ansible master to avoid distributing more keys
-  connection: local
   authorized_key:
     user: "{{ borgbackup_server_user }}"
     key: "{{ borgbackup_client_ssh_pubkey_file.stdout }}"
     key_options: 'command="cd {{ borgbackup_server_pool }}/{{ inventory_hostname }};borg serve --restrict-to-path {{ borgbackup_server_pool }}/{{ inventory_hostname }}",no-port-forwarding,no-X11-forwarding,no-pty,no-agent-forwarding,no-user-rc'
 
 - name: create repo path for host
   vars:
-    ansible_become_pass: "{{ borgbackup_server_password | default(ansible_become_password) }}"
+    ansible_become_pass: "{{ borgbackup_server_password | default('') }}"
   delegate_to: "{{ borgbackup_client_backup_server }}"
-  # Start the delegate from the ansible master to avoid distributing more keys
-  connection: local
   file:
     path: "{{ borgbackup_server_pool }}/{{ inventory_hostname }}"
     owner: "{{ borgbackup_server_user }}"
@@ -64,7 +60,7 @@
 - name: check if the repositories already exist
   command: "{{ borgbackup_binary }} list {{ borgbackup_server_user }}@{{ borgbackup_client_backup_server }}:{{ item.name }}"
   environment:
-    - BORG_RSH: "ssh -o StrictHostKeyChecking=no -i {{ borgbackup_client_ssh_key_file }}"
+    - BORG_RSH: "ssh -o StrictHostKeyChecking=no -i {{ borgbackup_client_ssh_key_file }} -p {{ borgbackup_client_backup_server_port }}"
     - BORG_PASSPHRASE: "{{ borgbackup_passphrase }}"
   with_items: "{{ borgbackup_create_jobs }}"
   register: list_repos
@@ -85,7 +81,7 @@
 - name: initialize repositories
   command: "{{ borgbackup_binary }} init --encryption {{ borgbackup_encryption_mode }} {{ borgbackup_server_user }}@{{ borgbackup_client_backup_server }}:{{ item.name }}"
   environment:
-    - BORG_RSH: "ssh -o StrictHostKeyChecking=no -i {{ borgbackup_client_ssh_key_file }}"
+    - BORG_RSH: "ssh -o StrictHostKeyChecking=no -i {{ borgbackup_client_ssh_key_file }} -p {{ borgbackup_client_backup_server_port }}"
     - BORG_PASSPHRASE: "{{ borgbackup_passphrase }}"
   with_items: "{{ borgbackup_create_jobs }}"
   register: borgbackup_initialize_result
@@ -193,4 +189,4 @@
   args:
     chdir: "{{ borgbackup_client_lastlog_dir }}"
     creates: "{{ borgbackup_client_lastlog_dir }}/{{ item.name }}_{{ check_suffix_script_filename }}.lastlog"
-  with_items: "{{ borgbackup_check_jobs }}"
+  with_items: "{{ borgbackup_check_jobs }}"

templates/check_job.sh.j2

@@ -2,7 +2,7 @@
 
 set -e
 
-export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }}"
+export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }} -p {{ borgbackup_client_backup_server_port }}"
 export BORG_PASSPHRASE="{{ borgbackup_passphrase }}"
 
 REPOSITORY={{ borgbackup_server_user }}@{{ borgbackup_client_backup_server_lanfreebackup | default(borgbackup_client_backup_server) }}:{{ item.name }}

templates/create_job.sh.j2

@@ -2,7 +2,7 @@
 
 set -e
 
-export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }}"
+export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }} -p {{ borgbackup_client_backup_server_port }}"
 export BORG_PASSPHRASE="{{ borgbackup_passphrase }}"
 
 REPOSITORY={{ borgbackup_server_user }}@{{ borgbackup_client_backup_server_lanfreebackup | default(borgbackup_client_backup_server) }}:{{ item.name }}
@@ -19,6 +19,6 @@ while [ $retry -gt 0 ]; do
     {% endfor %}
     2>&1 | tee {{ borgbackup_client_lastlog_dir }}/{{ item.name }}_{{ create_suffix_script_filename }}.lastlog \
     | /usr/bin/logger -t borgbackup_backup_{{ item.name }}_{{ borgbackup_client_backup_server }}
-  for i in ${PIPESTATUS[@]}; do let step_status+=$i ;done
-  if [ $step_status -eq 0 ]; then retry=0; else sleep {{ borgbackup_task_retry_wait | default(30) }}; let retry-=1; fi
+  for i in ${PIPESTATUS[@]}; do step_status+=$((step_status+i)) ;done
+  if [ $step_status -eq 0 ]; then retry=0; else sleep {{ borgbackup_task_retry_wait | default(30) }}; retry=$((retry-1)); step_status=0; fi
 done

templates/prune_job.sh.j2

@@ -2,7 +2,7 @@
 
 set -e
 
-export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }}"
+export BORG_RSH="ssh -i {{ borgbackup_client_ssh_key_file }} -p {{ borgbackup_client_backup_server_port }}"
 export BORG_PASSPHRASE="{{ borgbackup_passphrase }}"
 
 REPOSITORY={{ borgbackup_server_user }}@{{ borgbackup_client_backup_server_lanfreebackup | default(borgbackup_client_backup_server) }}:{{ item.name }}