Backup: Added user agent to Rclone command.

desimaniac · desimaniac · commit ae2b9fe9824e · 2019-05-18T12:01:25.000-05:00
diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml
@@ -256,6 +256,7 @@
   - name: Snapshot | Delete btrfs snapshot
     command: "btrfs subvolume delete /btrfs/snapshots/root"
     when: (use_snapshot) and (snapshot_type == 'btrfs')
+    ignore_errors: yes
 
   - name: Check if tar files were created
     find:
@@ -340,7 +341,11 @@
 
   # Due to a touch command in a previous backup, all files on rclone.destination have same mod dates, therefore, only one file's mod date is needed.
   - name: "Get datestamp for previous '{{ rclone.destination }}/settings.yml'"
-    shell: "rclone lsl {{ rclone.destination }}/settings.yml | sed -e 's/^[ \t]*//' | cut -d ' ' -f 2,3 | cut -d '.' -f 1 | sed s/' '/_/g | sed s/':'/./g"
+    shell: |
+      /usr/bin/rclone lsl \
+        {{ rclone.destination }}/settings.yml \
+        --user-agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36' \
+        | sed -e 's/^[ \t]*//' | cut -d ' ' -f 2,3 | cut -d '.' -f 1 | sed s/' '/_/g | sed s/':'/./g
     become: yes
     become_user: "{{ user }}"
     register: rclone_timestamp
@@ -349,7 +354,11 @@
 
   # If rclone_timestamp is blank (would happen if settings.yml was not at destination), default the naming of files to '/archived/old/filename.ext', else /archived/date/filename.ext.
   - name: "Archive previous files in '{{ rclone.destination }}'"
-    shell: "rclone moveto '{{ rclone.destination }}/{{ item }}' '{{ rclone.destination }}/archived/{{ rclone_timestamp.stdout | default('old', true) }}/{{ item }}' 2>/dev/null"
+    shell: |
+      /usr/bin/rclone moveto \
+        --user-agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36' \
+        '{{ rclone.destination }}/{{ item }}' '{{ rclone.destination }}/archived/{{ (rclone_timestamp.stdout) if (rclone_timestamp is defined) else 'old' }}/{{ item }}' \
+        2>/dev/null
     become: yes
     become_user: "{{ user }}"
     register: rclone_move
@@ -372,7 +381,15 @@
       timeout: 5
 
   - name: "Use rclone to upload backup to '{{ rclone.destination }}'"
-    command: "rclone copy '{{ local.destination }}' '{{ rclone.destination }}' --stats=30s -v --transfers=4 --drive-chunk-size=128M --log-file='/home/{{ user }}/logs/backup/cloudbox_backup_rclone.log'"
+    shell: |
+      /usr/bin/rclone copy \
+        --user-agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 Safari/537.36' \
+        --transfers=4 \
+        --drive-chunk-size=128M \
+        --stats=30s \
+        -v \
+        --log-file='/home/{{ user }}/logs/backup/cloudbox_backup_rclone.log' \
+        '{{ local.destination }}' '{{ rclone.destination }}'
     become: yes
     become_user: "{{ user }}"
     when: (rclone.enable)
@@ -438,6 +455,7 @@
   - name: Snapshot | Delete btrfs snapshot
     command: "btrfs subvolume delete /btrfs/snapshots/root"
     when: (use_snapshot) and (snapshot_type == 'btrfs')
+    ignore_errors: yes
 
   - name: Start plexdrive and containers
     block:
