From d61edab1241a05d444f093d25edbfa1aa58ee8bf Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 11 Jun 2019 18:36:16 +0200
Subject: [PATCH] ansible-playbooks/general#85 Linting
---
defaults/main.yml | 8 +++++---
tasks/initjailusers.yml | 2 +-
tasks/jailkit.yml | 36 ++++++++++++++++++------------------
tasks/main.yml | 2 +-
4 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 5d6218f..f1f25a3 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 00a392c..3ddfd10 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 2cf7abb..96d6019 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 9b23cc6..108ed12 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
--
GitLab