diff --git a/tasks/initjailusers.yml b/tasks/initjailusers.yml index 9f1abc6abe643094dfab56f747d7d14c2fee0d96..355246b9ddb51a24cb73b2567b2176bfe3081c46 100644 --- a/tasks/initjailusers.yml +++ b/tasks/initjailusers.yml @@ -11,7 +11,7 @@ - name: Copy user home directory into jails shell: jk_cp -j {{ jailroot }}/{{ item.0.jail.name }} -o -s -f /home/{{ username }}/{{ item.1 }} with_nested: - - {{ drupal_settings|default([]) }} + - '{{( drupal_settings|default([]) }})' - ['.bashrc', '.config', '.git-prompt.sh', diff --git a/tasks/jailkit.yml b/tasks/jailkit.yml index a8db6cb06f72a5e1530d706034b8780ed0a94232..59a40268380e4c27eac493e53835ef6138b2effa 100644 --- a/tasks/jailkit.yml +++ b/tasks/jailkit.yml @@ -16,8 +16,8 @@ recurse: yes follow: no with_flattened: - - {{ admins }} - - {{ jailusers }} + - '{{( admins }})' + - '{{( jailusers }})' - name: Check JailKit Requirement shell: ls /usr/sbin/jk_init @@ -159,8 +159,8 @@ group: root mode: 0755 with_flattened: - - {{ admins }} - - {{ jailusers }} + - '{{( admins }})' + - '{{( jailusers }})' loop_control: loop_var: username when: username != tunnel_user_name @@ -172,8 +172,8 @@ - name: Init Users include_tasks: initjailusers.yml with_flattened: - - {{ admins }} - - {{ jailusers }} + - '{{( admins }})' + - '{{( jailusers }})' loop_control: loop_var: username when: username != tunnel_user_name and jailuser_init diff --git a/tasks/updatejail.yml b/tasks/updatejail.yml index f787c426aa21b6896462437190333baedab46356..6efcbf50181bbcc0b5ca4bc967a552d95a75f90b 100644 --- a/tasks/updatejail.yml +++ b/tasks/updatejail.yml @@ -18,8 +18,8 @@ recurse: yes follow: no with_flattened: - - {{ admins }} - - {{ jailusers }} + - '{{( admins }})' + - '{{( jailusers }})' - name: Set shell for crontabs cron: diff --git a/templates/jail b/templates/jail index 76c67fe97002c17d8eac3ce48d7cdd840ac5067a..ab09988e05da9706d6c0cf1c58cc3adf6e2d899f 100644 --- a/templates/jail +++ b/templates/jail @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import argparse