ansible-roles/drupal#14 Change exatr var limit_drupal_sitie to limit_site and...

ansible-roles/drupal#14 Change exatr var limit_drupal_sitie to limit_site and enhance the script apache config to make use of it

tasks/initjailusers.yml

@@ -20,7 +20,7 @@
        '.ssh',
        '.zshrc'
       ]
-  when: item.0.jail is defined and username in item.0.jail.users and (limit_drupal_site is not defined or item.0.id is not defined or limit_drupal_site == item.0.id)
+  when: item.0.jail is defined and username in item.0.jail.users and (limit_site is not defined or item.0.id is not defined or limit_site == item.0.id)
   ignore_errors: true
   tags: 'JailUserInit'
 
@@ -30,7 +30,7 @@
     groups='{{ item.jail.name }}'
     append=yes
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_site is not defined or item.id is not defined or limit_site == item.id)
   tags: 'SetPermissions'
 
 - name: "Add User To Jail /etc/passwd"
@@ -40,7 +40,7 @@
     regexp='^{{ username }}:'
     line='{{ username }}:x:{{ userid.stdout }}:0::/var/www{{ item.webRoot|default("") }}:/bin/bash'
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and username in item.jail.users and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and username in item.jail.users and (limit_site is not defined or item.id is not defined or limit_site == item.id)
   tags: 'SetPermissions'
 
 - name: "File Modes and Ownership"
@@ -50,7 +50,7 @@
     state='directory'
     recurse=yes
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_site is not defined or item.id is not defined or limit_site == item.id)
   tags:
     - 'JailUserInit'
     - 'SetPermissions'

tasks/jailkit.yml

@@ -68,14 +68,14 @@
     mode='755'
   register: jail_available
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or item.id is not defined or limit_site == item.id)
 
 - name: "Init Jails"
   include: initjail.yml
   with_items: '{{ drupal_settings|default([]) }}'
   loop_control:
     loop_var: drupal
-  when: (jail_available|changed or jailsite_init_force) and (limit_drupal_site is not defined or drupal.id is not defined or limit_drupal_site == drupal.id)
+  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)
 
 - name: "Ensure tmp Directory"
   file:
@@ -85,7 +85,7 @@
     group='root'
     mode='777'
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or item.id is not defined or limit_site == item.id)
 
 - name: "Ensure var and log Directory"
   file:
@@ -95,7 +95,7 @@
     group='root'
     mode='755'
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or item.id is not defined or limit_site == item.id)
 
 - name: "Ensure Apache Log Directory"
   file:
@@ -105,7 +105,7 @@
     group='{{ item.jail.name }}'
     mode='755'
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or item.id is not defined or limit_site == item.id)
 
 - name: "Install logrotate script"
   template:
@@ -115,7 +115,7 @@
     group='root'
     mode='644'
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or item.id is not defined or limit_site == item.id)
   tags: 'logrotate'
 
 - name: "Ensure Apache Web Directory"
@@ -126,7 +126,7 @@
     group='{{ item.jail.name }}'
     mode='755'
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or item.id is not defined or limit_site == item.id)
 
 - name: "Remove PHP PHP Default Pool"
   file:
@@ -141,7 +141,7 @@
     group='root'
     mode='644'
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_drupal_site is not defined or item.id is not defined or limit_drupal_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or item.id is not defined or limit_site == item.id)
   notify: "Restart PHP-FPM"
 
 - name: "Copy Jail Start Script to user home directory"
@@ -200,7 +200,7 @@
   with_items: '{{ drupal_settings|default([]) }}'
   loop_control:
     loop_var: drupal
-  when: drupal.jail is defined and (limit_drupal_site is not defined or drupal.id is not defined or limit_drupal_site == drupal.id)
+  when: drupal.jail is defined and (limit_site is not defined or drupal.id is not defined or limit_site == drupal.id)
   tags:
     - 'UpdateJails'
     - 'shells'