ansible-inventories/arocom#2921 Fix bug and include a force init feature

tasks/jailkit.yml

@@ -30,6 +30,12 @@
   import_tasks: install.yml
   when: jailkit_available is defined and jailkit_available.stdout != '/usr/sbin/jk_init'
 
+# See https://savannah.nongnu.org/bugs/?58804
+- name: Patch JK Lib
+  command: sed -i 's/+chroot+rfile+/+chrootrfile+/g' /usr/share/jailkit/jk_lib.py
+  tags:
+    - always
+
 - name: Create Jail Root Directory
   file:
     path: '{{ jailroot }}'

tasks/updatejail.yml

@@ -4,7 +4,7 @@
 - block:
 
   - name: JailKit Update Components
-    shell: jk_init -j {{ jailroot }}/{{ drupal.jail.name }} {{ jailkit_components }}
+    shell: jk_init {% if force|default('no')=='yes' %}-f {% endif %}-j {{ jailroot }}/{{ drupal.jail.name }} {{ jailkit_components }}
 
   - name: JailKit Update Directories
     shell: jk_update -j {{ jailroot }}/{{ drupal.jail.name }} --skip={{ jailroot }}/{{ drupal.jail.name }}/home/{{ drupal.jail.name }} --skip=/etc/drush/aliases.drushrc.php /bin /dev /etc /home /lib /lib64 /opt /usr

templates/jk_init.ini

@@ -77,7 +77,7 @@ includesections = basicshell
 
 [zsh]
 comment = zsh shell
-paths = /usr/bin/zsh, /etc/zsh, /usr/lib/x86_64-linux-gnu/zsh, /usr/share/zsh
+paths = /bin/zsh, /usr/bin/zsh, /etc/zsh, /usr/lib/x86_64-linux-gnu/zsh, /usr/share/zsh
 users = root
 groups = root
 includesections = basicshell