Skip to content
Snippets Groups Projects
Commit a69c3860 authored by jurgenhaas's avatar jurgenhaas
Browse files

ansible-playbooks/general#72 All includes are now include_tasks and they...

ansible-playbooks/general#72 All includes are now include_tasks and they always have a tag associated
parent d49307f5
Branches
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@
command: id -u {{ username }}
register: userid
changed_when: false
tags: always
tags: 'always'
- name: "Copy user home directory into jails"
shell: jk_cp -j {{ jailroot }}/{{ item.0.jail.name }} -o -s -f /home/{{ username }}/{{ item.1 }}
......
......@@ -9,7 +9,7 @@
when: php_version|default('5.5') == '5.3'
- set_fact: phpFpmService='php7.0-fpm'
when: php_version|default('5.5') == '7'
tags: always
tags: 'always'
- name: "Reset Permissions in User Homes"
file:
......@@ -28,8 +28,9 @@
failed_when: false
changed_when: false
- import_tasks: install.yml
- include_tasks: install.yml
when: jailkit_available is defined and jailkit_available.stdout != '/usr/sbin/jk_init'
tags: 'always'
- name: "Create Jail Root Directory"
file:
......@@ -76,6 +77,7 @@
loop_control:
loop_var: drupal
when: (jail_available|changed or jailsite_init_force) and (limit_site is not defined or drupal.id is not defined or limit_site == drupal.id)
tags: 'always'
- name: "Ensure tmp Directory"
file:
......@@ -170,6 +172,7 @@
loop_control:
loop_var: username
when: username != tunnel_user_name and jailuser_init
tags: 'always'
- name: "Assign Jails To Users"
template:
......
......@@ -3,10 +3,11 @@
- name: "JailKit Role"
set_fact: role_jailkit_started=true
tags: always
tags: 'always'
- block:
- import_tasks: jailkit.yml
- include_tasks: jailkit.yml
tags: 'always'
when: '"jailkit" not in excluded_roles and jailkit'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment