From 2e9b6c0680e33b7011adab1a629cabcd745e3ca4 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 7 Feb 2024 16:15:32 +0100 Subject: [PATCH] amavis/ldap: make ldap_suffix mandatory --- CHANGELOG.md | 2 ++ amavis/templates/amavis.conf.j2 | 2 +- ldap/tasks/nagios.yml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d899a6..c747fbc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Changed * add-vm.sh: allow VM name max length > 20 +* amavis: make ldap_suffix mandatory * apache : fix goaway pattern for bad bots * apache : rename MaxRequestsPerChild to MaxConnectionsPerChild (new name) * apache: use backward compatible Redirect directive @@ -50,6 +51,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * evolinux-base: dump-server-state upstream release 23.11 * evolinux-base: use separate default config file for rsyslog * kvmstats: use .capacity instead of .physical for disk size +* ldap: make ldap_suffix mandatory * listupgrade : old-kernel-removal.sh upstream release 24.01 * log2mail: move custom config in separate file * lxc: init /etc git repository in lxc container diff --git a/amavis/templates/amavis.conf.j2 b/amavis/templates/amavis.conf.j2 index cbe597a2..8bc9bae8 100644 --- a/amavis/templates/amavis.conf.j2 +++ b/amavis/templates/amavis.conf.j2 @@ -44,7 +44,7 @@ $max_servers = 2; $enable_ldap = 1; $default_ldap = { hostname => '127.0.0.1', tls => 0, - base => '{{ ldap_suffix }}', scope => 'sub', + base => '{{ ldap_suffix | mandatory }}', scope => 'sub', query_filter => '(&(mailacceptinggeneralid=%m)(isActive=TRUE))' }; diff --git a/ldap/tasks/nagios.yml b/ldap/tasks/nagios.yml index 183ba258..1fa17241 100644 --- a/ldap/tasks/nagios.yml +++ b/ldap/tasks/nagios.yml @@ -50,8 +50,8 @@ mode: "0640" loop: - { option: 'hostname', value: '127.0.0.1' } - - { option: 'base', value: "{{ ldap_suffix }}" } - - { option: 'bind', value: "cn=nagios,ou=ldapusers,{{ ldap_suffix }}" } + - { option: 'base', value: "{{ ldap_suffix | mandatory }}" } + - { option: 'bind', value: "cn=nagios,ou=ldapusers,{{ ldap_suffix | mandatory }}" } - { option: 'pass', value: "{{ ldap_nagios_password }}" } when: not nagios_monitoring_plugins_path.stat.exists