bugfix sabnzbd

projetssd · Dec 9, 2021 · af8a262 · af8a262
1 parent 99c6e05
commit af8a262
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/includes/dockerapps/posttasks/sabnzbd.yml b/includes/dockerapps/posttasks/sabnzbd.yml
@@ -1,12 +1,12 @@
 ---
 - name: 'Checking for existing app data'
   stat:
-    path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+    path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
   register: inicheck
 
 - name: 'Waiting for {{ pgrole }} to initialize'
   wait_for:
-    path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+    path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
     state: present
     delay: 5
 
@@ -19,79 +19,79 @@
   block:
     - name: Set host_whitelist
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: host_whitelist
         value: '{{sub[pgrole][pgrole] if sub_enabled else pgrole}}.{{user.domain}},'
         state: present
 
     - name: Set direct_unpack
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: direct_unpack
         value: '1'
         state: present
 
     - name: Set ignore_samples
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: ignore_samples
         value: '1'
         state: present
 
     - name: set unwanted_extensions
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: unwanted_extensions
         value: exe, com, bat, sh, iso, m2ts, mt2s
         state: present
 
     - name: set cleanup_list
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: cleanup_list
         value: nfo, exe, com, bat, txt, doc, xls, xlxs, docx, doc, jpg, jeg, gif, png
         state: present
 
     - name: set action_on_unwanted_extensions
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: action_on_unwanted_extensions
         value: '2'
         state: present
 
     - name: set pause_on_pwrar - aborts encrypted rar rather than pausing
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: pause_on_pwrar
         value: '2'
         state: present
 
     - name: set new_nzb_on_failure - try a new nzb if it fails
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: new_nzb_on_failure
         value: '1'
         state: present
 
     - name: set flat_unpack
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: flat_unpack
         value: '1'
         state: present
 
     - name: set download_free
       ini_file:
-        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/sabnzbd.ini"
+        path: "{{ lookup('env','CONFDIR') }}/docker/{{ lookup('env','USER') }}/{{ pgrole }}/config/sabnzbd.ini"
         section: misc
         option: download_free
         value: '25G'

diff --git a/includes/dockerapps/vars/picapport.yml b/includes/dockerapps/vars/picapport.yml
@@ -14,4 +14,4 @@ pg_env:
   PUID: "{{ lookup('env','MYUID') }}"
   PGID: "{{ lookup('env','MYGID') }}"
 specific_docker_info:
-  user: "{{ user.name }}"
+  user: "{{ user.userid }}:{{ user.groupid }}"