diff options
| -rw-r--r-- | galaxy.yml | 2 | ||||
| -rw-r--r-- | roles/icinga2/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/icinga2/templates/icinga2.conf.j2 | 4 |
3 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,6 @@ namespace: kompetenzbolzen name: stuff -version: 0.10.0 +version: 0.11.0 readme: README.md authors: - Jonas Gunz <himself@jonasgunz.de> diff --git a/roles/icinga2/defaults/main.yml b/roles/icinga2/defaults/main.yml index d4fe89f..6a15a37 100644 --- a/roles/icinga2/defaults/main.yml +++ b/roles/icinga2/defaults/main.yml @@ -14,6 +14,7 @@ icinga: crt: '/etc/ssl/cert/ssl-cert-snakeoil.pem' key: '/etc/ssl/private/ssl-cert-snakeoil.key' ca: '/etc/ssl/certs/ca-certificates.crt' + extra_conf_dirs: [] config: manage: false git_url: '' diff --git a/roles/icinga2/templates/icinga2.conf.j2 b/roles/icinga2/templates/icinga2.conf.j2 index 921c2d6..0c17c24 100644 --- a/roles/icinga2/templates/icinga2.conf.j2 +++ b/roles/icinga2/templates/icinga2.conf.j2 @@ -20,6 +20,10 @@ include "ido-mysql.conf" include "api_users.conf" include "influx.conf" +{% for dir in icinga.extra_conf_dirs %} +include_recursive "{{ dir }}" +{% endfor %} + {% if icinga.config.manage is true %} include_recursive "conf.git.d" {% else %} |