forked from evolix/ansible-roles
add default (useless) value for file lookup
This commit is contained in:
parent
4d83f25ae6
commit
02451f1e67
|
@ -31,6 +31,7 @@ The **patch** part changes incrementally at each release.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
* add default (useless) value for file lookup (first_found)
|
||||||
* fix pipefail option for shell invocations
|
* fix pipefail option for shell invocations
|
||||||
* ldap: fix edge cases where passwords were not set/get properly
|
* ldap: fix edge cases where passwords were not set/get properly
|
||||||
* listupgrade: fix wget error + shellcheck cleanup
|
* listupgrade: fix wget error + shellcheck cleanup
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/evobackup-client/{{ evobackup_client__cron_template_name }}.{{ inventory_hostname }}.sh.j2"
|
- "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/evobackup-client/{{ evobackup_client__cron_template_name }}.sh.j2"
|
||||||
- "templates/zzz_evobackup.default.sh.j2"
|
- "templates/zzz_evobackup.default.sh.j2"
|
||||||
tags:
|
tags:
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "motd/motd.{{ inventory_hostname }}.j2"
|
- "motd/motd.{{ inventory_hostname }}.j2"
|
||||||
- "motd/motd.{{ host_group }}.j2"
|
- "motd/motd.{{ host_group | default('all') }}.j2"
|
||||||
- "motd/motd.default.j2"
|
- "motd/motd.default.j2"
|
||||||
tags:
|
tags:
|
||||||
- motd
|
- motd
|
||||||
|
|
|
@ -151,7 +151,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/filebeat/filebeat.{{ inventory_hostname }}.yml.j2"
|
- "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/filebeat.default.yml.j2"
|
||||||
- "templates/filebeat.default.yml.j2"
|
- "templates/filebeat.default.yml.j2"
|
||||||
notify: restart filebeat
|
notify: restart filebeat
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
---
|
---
|
||||||
general_alert_email: "root@localhost"
|
general_alert_email: "root@localhost"
|
||||||
listupgrade_alert_email: Null
|
listupgrade_alert_email: Null
|
||||||
|
|
||||||
|
listupgrade_cron_enabled: true
|
|
@ -53,6 +53,7 @@
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
force: no
|
force: no
|
||||||
|
when: listupgrade_cron_enabled | bool
|
||||||
|
|
||||||
- name: old-kernel-autoremoval script is present
|
- name: old-kernel-autoremoval script is present
|
||||||
copy:
|
copy:
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/logstash/logstash.{{ inventory_hostname }}.conf.j2"
|
- "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/logstash.default.conf.j2"
|
||||||
- "templates/logstash.default.conf.j2"
|
- "templates/logstash.default.conf.j2"
|
||||||
register: logstash_template
|
register: logstash_template
|
||||||
|
|
|
@ -123,7 +123,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/metricbeat/metricbeat.{{ inventory_hostname }}.yml.j2"
|
- "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/metricbeat.default.yml.j2"
|
||||||
- "templates/metricbeat.default.yml.j2"
|
- "templates/metricbeat.default.yml.j2"
|
||||||
notify: restart metricbeat
|
notify: restart metricbeat
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/minifirewall-tail/minifirewall.{{ inventory_hostname }}.tail.j2"
|
- "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-tail/minifirewall.default.tail.j2"
|
||||||
- "templates/minifirewall.default.tail.j2"
|
- "templates/minifirewall.default.tail.j2"
|
||||||
register: minifirewall_tail_template
|
register: minifirewall_tail_template
|
||||||
|
|
|
@ -89,8 +89,8 @@
|
||||||
templates:
|
templates:
|
||||||
- "templates/varnish/varnish.{{ inventory_hostname }}.vcl.j2"
|
- "templates/varnish/varnish.{{ inventory_hostname }}.vcl.j2"
|
||||||
- "templates/varnish/default.{{ inventory_hostname }}.vcl.j2"
|
- "templates/varnish/default.{{ inventory_hostname }}.vcl.j2"
|
||||||
- "templates/varnish/varnish.{{ host_group }}.vcl.j2"
|
- "templates/varnish/varnish.{{ host_group | default('all') }}.vcl.j2"
|
||||||
- "templates/varnish/default.{{ host_group }}.vcl.j2"
|
- "templates/varnish/default.{{ host_group | default('all') }}.vcl.j2"
|
||||||
- "templates/varnish/varnish.default.vcl.j2"
|
- "templates/varnish/varnish.default.vcl.j2"
|
||||||
- "templates/varnish/default.default.vcl.j2"
|
- "templates/varnish/default.default.vcl.j2"
|
||||||
- "templates/varnish.vcl.j2"
|
- "templates/varnish.vcl.j2"
|
||||||
|
|
|
@ -1,34 +1,34 @@
|
||||||
# Set custom web-add.conf file
|
# Set custom web-add.conf file
|
||||||
- "templates/evoadmin-web/web-add.{{ inventory_hostname }}.conf.j2"
|
- "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/evoadmin-web/web-add.conf.j2"
|
||||||
And force it to update:
|
And force it to update:
|
||||||
evoadmin_add_conf_force: True
|
evoadmin_add_conf_force: True
|
||||||
|
|
||||||
# Set custom web-mail.tpl
|
# Set custom web-mail.tpl
|
||||||
- "templates/evoadmin-web/web-mail.{{ inventory_hostname }}.tpl.j2"
|
- "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/evoadmin-web/web-mail.tpl.j2"
|
||||||
And force it to update:
|
And force it to update:
|
||||||
evoadmin_mail_tpl_force: True
|
evoadmin_mail_tpl_force: True
|
||||||
|
|
||||||
# Set custom evoadmin.conf VHost
|
# Set custom evoadmin.conf VHost
|
||||||
- "templates/evoadmin-web/evoadmin.{{ inventory_hostname }}.conf.j2"
|
- "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-web/evoadmin.conf.j2"
|
||||||
And force it to update:
|
And force it to update:
|
||||||
evoadmin_force_vhost: True
|
evoadmin_force_vhost: True
|
||||||
|
|
||||||
# Set custom config.local.php
|
# Set custom config.local.php
|
||||||
- "templates/evoadmin-web/config.local.{{ inventory_hostname }}.php.j2"
|
- "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/evoadmin-web/config.local.php.j2"
|
||||||
And force it to update:
|
And force it to update:
|
||||||
evoadmin_config_local_php_force: True
|
evoadmin_config_local_php_force: True
|
||||||
|
|
||||||
# Set evoadmin-web sudoers file
|
# Set evoadmin-web sudoers file
|
||||||
- "templates/evoadmin-web/sudoers.{{ inventory_hostname }}.j2"
|
- "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/evoadmin-web/sudoers.j2"
|
||||||
- "sudoers.j2"
|
- "sudoers.j2"
|
||||||
And force it to update:
|
And force it to update:
|
||||||
|
@ -39,7 +39,7 @@ evoadmin_htpasswd: True
|
||||||
|
|
||||||
Overwrite its template:
|
Overwrite its template:
|
||||||
- "templates/evoadmin-web/htpasswd.{{ inventory_hostname }}.j2"
|
- "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/evoadmin-web/htpasswd.j2"
|
||||||
- "htpasswd.j2"
|
- "htpasswd.j2"
|
||||||
And force it to update:
|
And force it to update:
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/evoadmin-web/web-add.{{ inventory_hostname }}.conf.j2"
|
- "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/evoadmin-web/web-add.conf.j2"
|
||||||
- "templates/web-add.conf.j2"
|
- "templates/web-add.conf.j2"
|
||||||
register: evoadmin_add_conf_template
|
register: evoadmin_add_conf_template
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/evoadmin-web/web-mail.{{ inventory_hostname }}.tpl.j2"
|
- "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/evoadmin-web/web-mail.tpl.j2"
|
||||||
- "templates/web-mail.tpl.j2"
|
- "templates/web-mail.tpl.j2"
|
||||||
register: evoadmin_mail_tpl_template
|
register: evoadmin_mail_tpl_template
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/evoadmin-web/sudoers.{{ inventory_hostname }}.j2"
|
- "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/evoadmin-web/sudoers.j2"
|
||||||
- "templates/sudoers.j2"
|
- "templates/sudoers.j2"
|
||||||
register: evoadmin_sudoers_conf
|
register: evoadmin_sudoers_conf
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/evoadmin-web/evoadmin.{{ inventory_hostname }}.conf.j2"
|
- "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-web/evoadmin.conf.j2"
|
||||||
- "templates/evoadmin.conf.j2"
|
- "templates/evoadmin.conf.j2"
|
||||||
register: evoadmin_vhost_template
|
register: evoadmin_vhost_template
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/evoadmin-web/htpasswd.{{ inventory_hostname }}.j2"
|
- "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/evoadmin-web/htpasswd.j2"
|
||||||
- "templates/htpasswd.j2"
|
- "templates/htpasswd.j2"
|
||||||
register: evoadmin_htpasswd_template
|
register: evoadmin_htpasswd_template
|
||||||
|
@ -86,7 +86,7 @@
|
||||||
vars:
|
vars:
|
||||||
templates:
|
templates:
|
||||||
- "templates/evoadmin-web/config.local.{{ inventory_hostname }}.php.j2"
|
- "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/evoadmin-web/config.local.php.j2"
|
||||||
- "templates/config.local.php.j2"
|
- "templates/config.local.php.j2"
|
||||||
register: evoadmin_config_local_php_template
|
register: evoadmin_config_local_php_template
|
||||||
|
|
Loading…
Reference in a new issue