From c659cc922dc02ebd8ef942ebb92e4388ae29c018 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 11 Jun 2019 12:45:04 +0200
Subject: [PATCH] ansible-playbooks/general#85 Change remaining false to no
---
tasks/initjailusers.yml | 8 ++++----
tasks/jailkit.yml | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/tasks/initjailusers.yml b/tasks/initjailusers.yml
index 355246b..020377a 100644
--- a/tasks/initjailusers.yml
+++ b/tasks/initjailusers.yml
@@ -21,7 +21,7 @@
'.ssh',
'.zshrc'
]
- when: item.0.jail is defined and username in item.0.jail.users and (limit_site is not defined or limit_site == 'False' or item.0.id is not defined or limit_site == item.0.id)
+ 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:
- JailUserInit
@@ -32,7 +32,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_site is not defined or limit_site == 'False' or item.id is not defined or limit_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 limit_site == 'no' or item.id is not defined or limit_site == item.id)
tags:
- SetPermissions
@@ -43,7 +43,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_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+ when: item.jail is defined and username in item.jail.users and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
tags:
- SetPermissions
@@ -55,7 +55,7 @@
recurse: yes
follow: no
with_items: '{{ drupal_settings|default([]) }}'
- when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_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 limit_site == 'no' or item.id is not defined or limit_site == item.id)
tags:
- JailUserInit
- SetPermissions
diff --git a/tasks/jailkit.yml b/tasks/jailkit.yml
index 59a4026..9c2ecbb 100644
--- a/tasks/jailkit.yml
+++ b/tasks/jailkit.yml
@@ -67,14 +67,14 @@
mode: 0755
register: jail_available
with_items: '{{ drupal_settings|default([]) }}'
- when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+ 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)
- name: Init Jails
include_tasks: initjail.yml
with_items: '{{ drupal_settings|default([]) }}'
loop_control:
loop_var: drupal
- when: drupal.jail is defined and (jail_available is changed or jailsite_init_force) and (limit_site is not defined or limit_site == 'False' or drupal.id is not defined or limit_site == drupal.id)
+ when: drupal.jail is defined and (jail_available is changed or jailsite_init_force) and (limit_site is not defined or limit_site == 'no' or drupal.id is not defined or limit_site == drupal.id)
- name: Ensure tmp Directory
file:
@@ -84,7 +84,7 @@
group: root
mode: 0777
with_items: '{{ drupal_settings|default([]) }}'
- when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+ 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)
- name: Ensure var and log Directory
file:
@@ -94,7 +94,7 @@
group: root
mode: 0755
with_items: '{{ drupal_settings|default([]) }}'
- when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+ 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)
- name: Ensure Apache Log Directory
file:
@@ -104,7 +104,7 @@
group: '{{ item.jail.name }}'
mode: 0755
with_items: '{{ drupal_settings|default([]) }}'
- when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+ 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)
- name: Install logrotate script
template:
@@ -114,7 +114,7 @@
group: root
mode: 0644
with_items: '{{ drupal_settings|default([]) }}'
- when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+ 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:
- logrotate
@@ -126,7 +126,7 @@
group: '{{ item.jail.name }}'
mode: 0755
with_items: '{{ drupal_settings|default([]) }}'
- when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+ 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)
- block:
@@ -143,7 +143,7 @@
group: root
mode: 0644
with_items: '{{ drupal_settings|default([]) }}'
- when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+ 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:
@@ -199,7 +199,7 @@
with_items: '{{ drupal_settings|default([]) }}'
loop_control:
loop_var: drupal
- when: drupal.jail is defined and (limit_site is not defined or limit_site == 'False' or drupal.id is not defined or limit_site == drupal.id)
+ when: drupal.jail is defined and (limit_site is not defined or limit_site == 'no' or drupal.id is not defined or limit_site == drupal.id)
tags:
- UpdateJails
- shells
--
GitLab