diff --git a/defaults/main.yml b/defaults/main.yml index 5d6218f9fed21063731a52d2eecd39af52908f12..f1f25a397fc64edc5a49823796716247b31286e7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,8 @@ -jailkit: false +--- + +jailkit: no jailroot: /jails -jailsite_init_force: false -jailuser_init: false +jailsite_init_force: no +jailuser_init: no jailkit_components: extendedshell git jk_lsh rsync scp sftp ssh php drush netutils jailusers: [] diff --git a/tasks/initjailusers.yml b/tasks/initjailusers.yml index 00a392c3396de7bf724998be21d818650dda283d..3ddfd1098accb1632da6e867e152e267fc7186a4 100644 --- a/tasks/initjailusers.yml +++ b/tasks/initjailusers.yml @@ -20,7 +20,7 @@ '.profile', '.ssh', '.zshrc' - ] + ] when: item.0.jail is defined and username in item.0.jail.users and (limit_site is not defined or limit_site == 'no' or item.0.id is not defined or limit_site == item.0.id) ignore_errors: yes tags: diff --git a/tasks/jailkit.yml b/tasks/jailkit.yml index 2cf7abb04203033fd7872766d159daf7cdd34bd6..96d601982c3492a728779dd718b3eb33f7c791cb 100644 --- a/tasks/jailkit.yml +++ b/tasks/jailkit.yml @@ -130,24 +130,24 @@ - block: - - name: Remove PHP PHP Default Pool - file: - path: /etc/{{ php_base_dir|default("php5") }}/fpm/pool.d/www.conf - state: absent - - - name: Create PHP Pool - template: - src: php_pool.conf - dest: /etc/{{ php_base_dir|default("php5") }}/fpm/pool.d/{{ item.jail.name }}.conf - owner: root - group: root - mode: 0644 - with_items: '{{ drupal_settings|default([]) }}' - when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id) - tags: - - ApacheConfig - notify: - - Restart PHP-FPM + - name: Remove PHP PHP Default Pool + file: + path: /etc/{{ php_base_dir|default("php5") }}/fpm/pool.d/www.conf + state: absent + + - name: Create PHP Pool + template: + src: php_pool.conf + dest: /etc/{{ php_base_dir|default("php5") }}/fpm/pool.d/{{ item.jail.name }}.conf + owner: root + group: root + mode: 0644 + with_items: '{{ drupal_settings|default([]) }}' + when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id) + tags: + - ApacheConfig + notify: + - Restart PHP-FPM when: php_fpm diff --git a/tasks/main.yml b/tasks/main.yml index 9b23cc6ccba901525eb732e56172403e3bffa9ad..108ed1292a09b1d8774a7bf624b7006fcc643d29 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,6 +9,6 @@ - block: - - import_tasks: jailkit.yml + - import_tasks: jailkit.yml when: not excluded_roles or "jailkit" not in excluded_roles and jailkit