Merge branch 'v.8.4' into v8.5

apps/_downloaders.yml

@@ -7,11 +7,3 @@
   file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
   with_items:
     - '{{path.stdout}}/incomplete/{{pgrole}}'
-  when: incomplete.stdout | length == 0
-
-- name: Creating incomplete paths
-  file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000'
-  with_items:
-    - '{{incomplete.stdout}}/{{pgrole}}'
-  when: incomplete.stdout | length > 0
-  ignore_errors: yes

apps/deluge.yml

@@ -108,7 +108,6 @@
         regexp: '"move_completed_path".*'
         line: '"move_completed_path": "{{path.stdout}}/downloads/{{pgrole}}",'
         state: present
-      when: incomplete.stdout | length == 0   
 
     - name: Set download location
       lineinfile:
@@ -116,15 +115,6 @@
         regexp: '"download_location".*'
         line: '"download_location": "{{path.stdout}}/incomplete/{{pgrole}}",'
         state: present
-      when: incomplete.stdout | length == 0
-
-    - name: Set download location
-      lineinfile:
-        path: '/opt/appdata/{{pgrole}}/core.conf'
-        regexp: '"download_location".*'
-        line: '"download_location": "{{incomplete.stdout}}/{{pgrole}}",'
-        state: present
-      when: incomplete.stdout | length > 0
 
     - name: Setting torrent file directory
       lineinfile:

apps/delugevpn.yml

@@ -114,23 +114,6 @@
         regexp: '"download_location".*'
         line: '"download_location": "{{path.stdout}}/downloads/{{pgrole}}",'
         state: present
-      when: incomplete.stdout | length == 0
-
-    - name: Set incomplete path
-      lineinfile:
-        path: '/opt/appdata/{{pgrole}}/core.conf'
-        regexp: '"download_location".*'
-        line: '"download_location": "{{path.stdout}}/incomplete/{{pgrole}}",'
-        state: present
-      when: incomplete.stdout | length > 0
-
-    - name: Setting complete downloads directory
-      lineinfile:
-        path: '/opt/appdata/{{pgrole}}/core.conf'
-        regexp: '"move_completed_path".*'
-        line: '"move_completed_path": "{{path.stdout}}/downloads/{{pgrole}}",'
-        state: present
-      when: incomplete.stdout | length > 0
 
     - name: Setting torrent file directory
       lineinfile:
@@ -152,15 +135,6 @@
         regexp: '"move_completed".*'
         line: '"move_completed": false,'
         state: present
-      when: incomplete.stdout | length == 0
-
-    - name: Setting move_completed when incomplete is defined
-      lineinfile:
-        path: '/opt/appdata/{{pgrole}}/core.conf'
-        regexp: '"move_completed".*'
-        line: '"move_completed": true,'
-        state: present
-      when: incomplete.stdout | length > 0
 
     - name: Setting extractor folder
       lineinfile: