diff --git a/CHANGELOG.md b/CHANGELOG.md index ef1aba95..c159d47a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ The **patch** part changes incrementally at each release. ### Fixed +* add default (useless) value for file lookup (first_found) * fix pipefail option for shell invocations * ldap: fix edge cases where passwords were not set/get properly * listupgrade: fix wget error + shellcheck cleanup diff --git a/evobackup-client/tasks/upload_scripts.yml b/evobackup-client/tasks/upload_scripts.yml index f3f7de25..79e5d7db 100644 --- a/evobackup-client/tasks/upload_scripts.yml +++ b/evobackup-client/tasks/upload_scripts.yml @@ -10,7 +10,7 @@ vars: templates: - "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.{{ inventory_hostname }}.sh.j2" - - "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.{{ host_group }}.sh.j2" + - "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.{{ host_group | default('all') }}.sh.j2" - "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.sh.j2" - "templates/zzz_evobackup.default.sh.j2" tags: diff --git a/evolinux-base/tasks/motd.yml b/evolinux-base/tasks/motd.yml index 59076f8e..076a4226 100644 --- a/evolinux-base/tasks/motd.yml +++ b/evolinux-base/tasks/motd.yml @@ -11,7 +11,7 @@ vars: templates: - "motd/motd.{{ inventory_hostname }}.j2" - - "motd/motd.{{ host_group }}.j2" + - "motd/motd.{{ host_group | default('all') }}.j2" - "motd/motd.default.j2" tags: - motd diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml index 06f7d564..4594d5ed 100644 --- a/filebeat/tasks/main.yml +++ b/filebeat/tasks/main.yml @@ -151,7 +151,7 @@ vars: templates: - "templates/filebeat/filebeat.{{ inventory_hostname }}.yml.j2" - - "templates/filebeat/filebeat.{{ host_group }}.yml.j2" + - "templates/filebeat/filebeat.{{ host_group | default('all') }}.yml.j2" - "templates/filebeat/filebeat.default.yml.j2" - "templates/filebeat.default.yml.j2" notify: restart filebeat diff --git a/listupgrade/defaults/main.yml b/listupgrade/defaults/main.yml index 3f72fbff..d3bdff78 100644 --- a/listupgrade/defaults/main.yml +++ b/listupgrade/defaults/main.yml @@ -1,3 +1,5 @@ --- general_alert_email: "root@localhost" listupgrade_alert_email: Null + +listupgrade_cron_enabled: true \ No newline at end of file diff --git a/listupgrade/tasks/main.yml b/listupgrade/tasks/main.yml index a1449b04..3ed23da3 100644 --- a/listupgrade/tasks/main.yml +++ b/listupgrade/tasks/main.yml @@ -53,6 +53,7 @@ owner: root group: root force: no + when: listupgrade_cron_enabled | bool - name: old-kernel-autoremoval script is present copy: diff --git a/logstash/tasks/main.yml b/logstash/tasks/main.yml index b4c71b3d..0b58dbe8 100644 --- a/logstash/tasks/main.yml +++ b/logstash/tasks/main.yml @@ -82,7 +82,7 @@ vars: templates: - "templates/logstash/logstash.{{ inventory_hostname }}.conf.j2" - - "templates/logstash/logstash.{{ host_group }}.conf.j2" + - "templates/logstash/logstash.{{ host_group | default('all') }}.conf.j2" - "templates/logstash/logstash.default.conf.j2" - "templates/logstash.default.conf.j2" register: logstash_template diff --git a/metricbeat/tasks/main.yml b/metricbeat/tasks/main.yml index 2290626e..14357f18 100644 --- a/metricbeat/tasks/main.yml +++ b/metricbeat/tasks/main.yml @@ -123,7 +123,7 @@ vars: templates: - "templates/metricbeat/metricbeat.{{ inventory_hostname }}.yml.j2" - - "templates/metricbeat/metricbeat.{{ host_group }}.yml.j2" + - "templates/metricbeat/metricbeat.{{ host_group | default('all') }}.yml.j2" - "templates/metricbeat/metricbeat.default.yml.j2" - "templates/metricbeat.default.yml.j2" notify: restart metricbeat diff --git a/minifirewall/tasks/tail.yml b/minifirewall/tasks/tail.yml index a086ead9..c8c4440e 100644 --- a/minifirewall/tasks/tail.yml +++ b/minifirewall/tasks/tail.yml @@ -8,7 +8,7 @@ vars: templates: - "templates/minifirewall-tail/minifirewall.{{ inventory_hostname }}.tail.j2" - - "templates/minifirewall-tail/minifirewall.{{ host_group }}.tail.j2" + - "templates/minifirewall-tail/minifirewall.{{ host_group | default('all') }}.tail.j2" - "templates/minifirewall-tail/minifirewall.default.tail.j2" - "templates/minifirewall.default.tail.j2" register: minifirewall_tail_template diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml index 3d2a134d..95a720c8 100644 --- a/varnish/tasks/main.yml +++ b/varnish/tasks/main.yml @@ -89,8 +89,8 @@ templates: - "templates/varnish/varnish.{{ inventory_hostname }}.vcl.j2" - "templates/varnish/default.{{ inventory_hostname }}.vcl.j2" - - "templates/varnish/varnish.{{ host_group }}.vcl.j2" - - "templates/varnish/default.{{ host_group }}.vcl.j2" + - "templates/varnish/varnish.{{ host_group | default('all') }}.vcl.j2" + - "templates/varnish/default.{{ host_group | default('all') }}.vcl.j2" - "templates/varnish/varnish.default.vcl.j2" - "templates/varnish/default.default.vcl.j2" - "templates/varnish.vcl.j2" diff --git a/webapps/evoadmin-web/README.md b/webapps/evoadmin-web/README.md index 977764ad..24242d1b 100644 --- a/webapps/evoadmin-web/README.md +++ b/webapps/evoadmin-web/README.md @@ -1,34 +1,34 @@ # Set custom web-add.conf file - "templates/evoadmin-web/web-add.{{ inventory_hostname }}.conf.j2" -- "templates/evoadmin-web/web-add.{{ host_group }}.conf.j2" +- "templates/evoadmin-web/web-add.{{ host_group | default('all') }}.conf.j2" - "templates/evoadmin-web/web-add.conf.j2" And force it to update: evoadmin_add_conf_force: True # Set custom web-mail.tpl - "templates/evoadmin-web/web-mail.{{ inventory_hostname }}.tpl.j2" -- "templates/evoadmin-web/web-mail.{{ host_group }}.tpl.j2" +- "templates/evoadmin-web/web-mail.{{ host_group | default('all') }}.tpl.j2" - "templates/evoadmin-web/web-mail.tpl.j2" And force it to update: evoadmin_mail_tpl_force: True # Set custom evoadmin.conf VHost - "templates/evoadmin-web/evoadmin.{{ inventory_hostname }}.conf.j2" -- "templates/evoadmin-web/evoadmin.{{ host_group }}.conf.j2" +- "templates/evoadmin-web/evoadmin.{{ host_group | default('all') }}.conf.j2" - "templates/evoadmin-web/evoadmin.conf.j2" And force it to update: evoadmin_force_vhost: True # Set custom config.local.php - "templates/evoadmin-web/config.local.{{ inventory_hostname }}.php.j2" -- "templates/evoadmin-web/config.local.{{ host_group }}.php.j2" +- "templates/evoadmin-web/config.local.{{ host_group | default('all') }}.php.j2" - "templates/evoadmin-web/config.local.php.j2" And force it to update: evoadmin_config_local_php_force: True # Set evoadmin-web sudoers file - "templates/evoadmin-web/sudoers.{{ inventory_hostname }}.j2" -- "templates/evoadmin-web/sudoers.{{ host_group }}.j2" +- "templates/evoadmin-web/sudoers.{{ host_group | default('all') }}.j2" - "templates/evoadmin-web/sudoers.j2" - "sudoers.j2" And force it to update: @@ -39,7 +39,7 @@ evoadmin_htpasswd: True Overwrite its template: - "templates/evoadmin-web/htpasswd.{{ inventory_hostname }}.j2" -- "templates/evoadmin-web/htpasswd.{{ host_group }}.j2" +- "templates/evoadmin-web/htpasswd.{{ host_group | default('all') }}.j2" - "templates/evoadmin-web/htpasswd.j2" - "htpasswd.j2" And force it to update: diff --git a/webapps/evoadmin-web/tasks/config.yml b/webapps/evoadmin-web/tasks/config.yml index 9f16a2d6..d4bf9174 100644 --- a/webapps/evoadmin-web/tasks/config.yml +++ b/webapps/evoadmin-web/tasks/config.yml @@ -15,7 +15,7 @@ vars: templates: - "templates/evoadmin-web/web-add.{{ inventory_hostname }}.conf.j2" - - "templates/evoadmin-web/web-add.{{ host_group }}.conf.j2" + - "templates/evoadmin-web/web-add.{{ host_group | default('all') }}.conf.j2" - "templates/evoadmin-web/web-add.conf.j2" - "templates/web-add.conf.j2" register: evoadmin_add_conf_template @@ -29,7 +29,7 @@ vars: templates: - "templates/evoadmin-web/web-mail.{{ inventory_hostname }}.tpl.j2" - - "templates/evoadmin-web/web-mail.{{ host_group }}.tpl.j2" + - "templates/evoadmin-web/web-mail.{{ host_group | default('all') }}.tpl.j2" - "templates/evoadmin-web/web-mail.tpl.j2" - "templates/web-mail.tpl.j2" register: evoadmin_mail_tpl_template diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml index 4593dcf3..68ac91de 100644 --- a/webapps/evoadmin-web/tasks/user.yml +++ b/webapps/evoadmin-web/tasks/user.yml @@ -116,7 +116,7 @@ vars: templates: - "templates/evoadmin-web/sudoers.{{ inventory_hostname }}.j2" - - "templates/evoadmin-web/sudoers.{{ host_group }}.j2" + - "templates/evoadmin-web/sudoers.{{ host_group | default('all') }}.j2" - "templates/evoadmin-web/sudoers.j2" - "templates/sudoers.j2" register: evoadmin_sudoers_conf diff --git a/webapps/evoadmin-web/tasks/web.yml b/webapps/evoadmin-web/tasks/web.yml index dc5eb8a3..7f95c96c 100644 --- a/webapps/evoadmin-web/tasks/web.yml +++ b/webapps/evoadmin-web/tasks/web.yml @@ -36,7 +36,7 @@ vars: templates: - "templates/evoadmin-web/evoadmin.{{ inventory_hostname }}.conf.j2" - - "templates/evoadmin-web/evoadmin.{{ host_group }}.conf.j2" + - "templates/evoadmin-web/evoadmin.{{ host_group | default('all') }}.conf.j2" - "templates/evoadmin-web/evoadmin.conf.j2" - "templates/evoadmin.conf.j2" register: evoadmin_vhost_template @@ -68,7 +68,7 @@ vars: templates: - "templates/evoadmin-web/htpasswd.{{ inventory_hostname }}.j2" - - "templates/evoadmin-web/htpasswd.{{ host_group }}.j2" + - "templates/evoadmin-web/htpasswd.{{ host_group | default('all') }}.j2" - "templates/evoadmin-web/htpasswd.j2" - "templates/htpasswd.j2" register: evoadmin_htpasswd_template @@ -86,7 +86,7 @@ vars: templates: - "templates/evoadmin-web/config.local.{{ inventory_hostname }}.php.j2" - - "templates/evoadmin-web/config.local.{{ host_group }}.php.j2" + - "templates/evoadmin-web/config.local.{{ host_group | default('all') }}.php.j2" - "templates/evoadmin-web/config.local.php.j2" - "templates/config.local.php.j2" register: evoadmin_config_local_php_template