diff options
| author |  meisterfischy <grbmn@kstn.in>
| 2022-01-22 17:19:41 +0100 |
|---|---|---|
| committer | meisterfischy <grbmn@kstn.in>
| 2022-01-22 17:19:41 +0100 |
| commit | 3db33ef566777f1963b6d6f0c7b6d7dcd14ed866 (patch) | |
| tree | 0641584e2b2b753bcb9a540e38ab43c43ea15992 /roles/icinga2/templates | |
| parent | a28793b684b3299c95e04924ed18e0fe5cd6f107 (diff) | |
| parent | d400f8820ad8e824ce454d9283e2bb8d6a28cdd3 (diff) | |
| download | ansible_collection-3db33ef566777f1963b6d6f0c7b6d7dcd14ed866.tar.gz | |
Merge branch 'dev' of giteaprod-01.my.cum.re:infra/ansible-kompetenzbolzen-stuff into calibre
Diffstat (limited to 'roles/icinga2/templates')
| -rw-r--r-- | roles/icinga2/templates/default-ssl.conf.j2 | 23 | ||||
| -rw-r--r-- | roles/icinga2/templates/icinga2.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/icinga2/templates/web/groups.ini.j2 | 2 |
3 files changed, 28 insertions, 1 deletions
diff --git a/roles/icinga2/templates/default-ssl.conf.j2 b/roles/icinga2/templates/default-ssl.conf.j2 new file mode 100644 index 0000000..7c9ab9e --- /dev/null +++ b/roles/icinga2/templates/default-ssl.conf.j2 @@ -0,0 +1,23 @@ +<IfModule mod_ssl.c> + <VirtualHost _default_:443> + ServerAdmin webmaster@localhost + DocumentRoot /var/www/html + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + SSLEngine on + SSLProtocol -all +TLSv1.2 +TLSv1.3 + SSLCertificateFile {{ icingaweb.cert.cert }} + SSLCertificateKeyFile {{ icingaweb.cert.key }} + + <FilesMatch "\.(cgi|shtml|phtml|php)$"> + SSLOptions +StdEnvVars + </FilesMatch> + <Directory /usr/lib/cgi-bin> + SSLOptions +StdEnvVars + </Directory> + </VirtualHost> +</IfModule> + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/roles/icinga2/templates/icinga2.conf.j2 b/roles/icinga2/templates/icinga2.conf.j2 index fcb9088..13d2d7f 100644 --- a/roles/icinga2/templates/icinga2.conf.j2 +++ b/roles/icinga2/templates/icinga2.conf.j2 @@ -19,4 +19,8 @@ include "features-enabled/*.conf" include "ido-mysql.conf" include "api_users.conf" +{% if icinga.config.manage is true %} +include_recursive "conf.git.d" +{% else %} include_recursive "conf.d" +{% endif %} diff --git a/roles/icinga2/templates/web/groups.ini.j2 b/roles/icinga2/templates/web/groups.ini.j2 index 848b254..04dba70 100644 --- a/roles/icinga2/templates/web/groups.ini.j2 +++ b/roles/icinga2/templates/web/groups.ini.j2 @@ -13,5 +13,5 @@ group_class = {{ icingaweb.ldap.groups.group_class }} group_filter = {{ icingaweb.ldap.groups.group_filter }} user_base_dn = {{ icingaweb.ldap.groups.user_base_dn }} user_class = {{ icingaweb.ldap.groups.user_class }} -user_name_attribute = {{ icingaweb.ldap.groups.uid }} +user_name_attribute = {{ icingaweb.ldap.groups.user_name_attribute }} {% endif %} |