fix hostname

suhancz · May 29, 2024 · 6113f85 · 6113f85
1 parent b378f6d
commit 6113f85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tasks/kolab/main.yml b/tasks/kolab/main.yml
@@ -511,7 +511,7 @@
   loop_control:
     loop_var: kolab_service
 - name: Refresh the certificates
-  ansible.builtin.command: 'openssl rehash /etc/dirsrv/slapd-{{ mailserver_domain | split(".") | first }}'
+  ansible.builtin.command: 'openssl rehash /etc/dirsrv/slapd-{{ mailserver_hostname }}'
 - name: Configure LDAP
   ansible.builtin.import_tasks: ldap/main.yml
   tags:

diff --git a/tasks/ldap/main.yml b/tasks/ldap/main.yml
@@ -21,7 +21,7 @@
     - { section: 'domain/LDAP', option: 'sudoers_base', value: "dc={{ mailserver_domain | split('.') | join(',dc=') }}" }
     - { section: 'domain/LDAP', option: 'sudo_provider', value: 'ldap' }
     - { section: 'domain/LDAP', option: 'ldap_id_use_start_tls', value: 'True' }
-    - { section: 'domain/LDAP', option: 'ldap_tls_cacert', value: '/etc/dirsrv/slapd-{{ mailserver_domain | split(".") | first }}/ca.crt' }
+    - { section: 'domain/LDAP', option: 'ldap_tls_cacert', value: '/etc/dirsrv/slapd-{{ mailserver_hostname }}/ca.crt' }
     - { section: 'domain/LDAP', option: 'cache_credentials', value: 'True' }
     - { section: 'domain/LDAP', option: 'enumerate', value: 'True' }
     - { section: 'domain/LDAP', option: 'ldap_tls_reqcert', value: 'allow' }
@@ -49,8 +49,8 @@
   loop:
     - "BASE    dc={{ mailserver_domain | split('.') | join(',dc=') }}"
     - "URI     ldaps://{{ mailserver_domain }}"
-    - 'TLS_CACERT      /etc/dirsrv/slapd-{{ mailserver_domain | split(".") | first }}/ca.crt'
-    - 'TLS_CACERTDIR /etc/dirsrv/slapd-{{ mailserver_domain | split(".") | first }}'
+    - 'TLS_CACERT      /etc/dirsrv/slapd-{{ mailserver_hostname }}/ca.crt'
+    - 'TLS_CACERTDIR /etc/dirsrv/slapd-{{ mailserver_hostname }}'
   loop_control:
     loop_var: openldap_item
 - name: Configure nscd