Merge pull request '🐛 Fix certificate setup for krypton' (!94) from fix-krypton-certs into master
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/94 Reviewed-by: dkdent <dkdent@netz39.de>
This commit is contained in:
commit
e199778041
1 changed files with 2 additions and 4 deletions
|
@ -7,8 +7,6 @@
|
||||||
|
|
||||||
data_dir: "/srv/data"
|
data_dir: "/srv/data"
|
||||||
|
|
||||||
dehydrated_certs_dir: "/usr/local/etc/dehydrated"
|
|
||||||
|
|
||||||
docker_ip_ranges: ["172.16.0.0/12", "192.168.0.0/16"]
|
docker_ip_ranges: ["172.16.0.0/12", "192.168.0.0/16"]
|
||||||
|
|
||||||
openldap_image_version: 1.5.0
|
openldap_image_version: 1.5.0
|
||||||
|
@ -50,7 +48,7 @@
|
||||||
- "{{ openldap_data }}/ldap"
|
- "{{ openldap_data }}/ldap"
|
||||||
- "{{ openldap_data }}/slapd"
|
- "{{ openldap_data }}/slapd"
|
||||||
- "{{ openldap_data }}/ldif"
|
- "{{ openldap_data }}/ldif"
|
||||||
- "{{ dehydrated_certs_dir }}/certs/{{ openldap_domain }}"
|
- "{{ dehydrated_certs_dir }}/{{ openldap_domain }}"
|
||||||
|
|
||||||
- name: Ensure container for openLDAP is running.
|
- name: Ensure container for openLDAP is running.
|
||||||
docker_container:
|
docker_container:
|
||||||
|
@ -85,7 +83,7 @@
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ openldap_data }}/ldap:/var/lib/ldap"
|
- "{{ openldap_data }}/ldap:/var/lib/ldap"
|
||||||
- "{{ openldap_data }}/slapd:/etc/ldap/slapd.d"
|
- "{{ openldap_data }}/slapd:/etc/ldap/slapd.d"
|
||||||
- "{{ dehydrated_certs_dir }}/certs/{{ openldap_domain }}:/container/service/slapd/assets/certs"
|
- "{{ dehydrated_certs_dir }}/{{ openldap_domain }}:/container/service/slapd/assets/certs"
|
||||||
- "{{ openldap_data }}/ldif/custom-element.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/01_netz39.ldif"
|
- "{{ openldap_data }}/ldif/custom-element.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/01_netz39.ldif"
|
||||||
timeout: 500
|
timeout: 500
|
||||||
command: "--copy-service --loglevel debug"
|
command: "--copy-service --loglevel debug"
|
||||||
|
|
Loading…
Reference in a new issue