evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 18 Releases 32 Wiki Activity

add default (useless) value for file lookup
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Jérémy Lecour 2021-05-19 14:35:08 +02:00 committed by Jérémy Lecour
parent 4d83f25ae6
commit 02451f1e67
14 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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

2
evobackup-client/tasks/upload_scripts.yml
View file

@ -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:

2
evolinux-base/tasks/motd.yml
View file

@ -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

2
filebeat/tasks/main.yml
View file

@ -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

2
listupgrade/defaults/main.yml
View file

@ -1,3 +1,5 @@
---
general_alert_email: "root@localhost"
listupgrade_alert_email: Null
listupgrade_cron_enabled: true

1
listupgrade/tasks/main.yml
View file

@ -53,6 +53,7 @@
owner: root
group: root
force: no
when: listupgrade_cron_enabled | bool
- name: old-kernel-autoremoval script is present
copy:

2
logstash/tasks/main.yml
View file

@ -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

2
metricbeat/tasks/main.yml
View file

@ -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

2
minifirewall/tasks/tail.yml
View file

@ -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

4
varnish/tasks/main.yml
View file

@ -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"

12
webapps/evoadmin-web/README.md
View file

@ -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:

4
webapps/evoadmin-web/tasks/config.yml
View file

@ -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

2
webapps/evoadmin-web/tasks/user.yml
View file

@ -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

6
webapps/evoadmin-web/tasks/web.yml
View file

@ -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