amavis/ldap: make ldap_suffix mandatory

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

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))'
 };
 

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