diff --git a/deploy_matrix.yml b/deploy_matrix.yml index de998e6..662940b 100644 --- a/deploy_matrix.yml +++ b/deploy_matrix.yml @@ -39,10 +39,10 @@ - "{{ vol_db }}" - "{{ npm_data }}" - "{{ npm_letsencrypt }}" - # - "{{ lemonldap_data }}" - # - "{{ lemonldap_cfg }}" - # - "{{ lemonldap_perl }}" - # - "{{ lemonldap_lib }}" + - "{{ lemonldap_data }}" + - "{{ lemonldap_cfg }}" + - "{{ lemonldap_lib }}" + - "{{ lemonldap_nginx }}" # ----------------------------------------------------------------- # Pull required images (including Teamspeak) @@ -78,10 +78,10 @@ name: "{{ db_image }}" state: present - # - name: Pull LemonLDAP image - # containers.podman.podman_image: - # name: "{{ lemonldap_image }}" - # state: present + - name: Pull LemonLDAP image + containers.podman.podman_image: + name: "{{ lemonldap_image }}" + state: present # ----------------------------------------------------------------- # Render all configuration files from the templates @@ -250,24 +250,24 @@ # ----------------------------------------------------------------- # LemonLDAP-NG #------------------------------------------------------------------ - # - name: Start LemonLDAP container - # containers.podman.podman_container: - # name: "{{ lemonldap_container_name }}" - # image: "{{ lemonldap_image }}" - # state: started - # env: - # SSODOMAIN="{{ top_domain }}" - # PORTAL_HOSTNAME="{{ ldap_portal_hostname }}" - # MANAGER_HOSTNAME="{{ ldap_manager_hostname }}" - # HANDLER_HOSTNAME="{{ ldap_handler_hostname }}" - # PORT="{{ lemonldap_port }}" - # FASTCGI_LISTEN_PORT="{{ lemonldap_cgi_port }}" - # IPV4_only="true" - # PRESERVEFILES="/etc/lemonldap-ng /var/lib/lemonldap-ng/conf /var/lib/lemonldap-ng/sessions /var/lib/lemonldap-ng/psessions /etc/nginx/sites-enabled" - # volumes: - # - "{{ lemonldap_data }}:/usr/share/lemonldap-ng:Z" - # - "{{ lemonldap_cfg }}:/etc/lemonldap-ng:Z" - # - "{{ lemonldap_perl }}:/usr/share:Z" - # - "{{ lemonldap_lib }}:/var/lib/lemonldap-ng:Z" - # network: "{{ podman_network }}" - # restart_policy: always \ No newline at end of file + - name: Start LemonLDAP container + containers.podman.podman_container: + name: "{{ lemonldap_container_name }}" + image: "{{ lemonldap_image }}" + state: started + env: + SSODOMAIN="{{ top_domain }}" + PORTAL_HOSTNAME="{{ ldap_portal_hostname }}" + MANAGER_HOSTNAME="{{ ldap_manager_hostname }}" + HANDLER_HOSTNAME="{{ ldap_handler_hostname }}" + PORT="{{ lemonldap_port }}" + FASTCGI_LISTEN_PORT="{{ lemonldap_cgi_port }}" + IPV4_only="true" + PRESERVEFILES="/etc/lemonldap-ng /var/lib/lemonldap-ng/conf /var/lib/lemonldap-ng/sessions /var/lib/lemonldap-ng/psessions /etc/nginx/sites-enabled" + volumes: + - "{{ lemonldap_cfg }}:/etc/lemonldap-ng:Z" + - "{{ lemonldap_data }}:/usr/share:Z" + - "{{ lemonldap_lib }}:/var/lib/lemonldap-ng:Z" + - "{{ lemonldap_nginx }}:/etc/nginx/sites-enabled:Z" + network: "{{ podman_network }}" + restart_policy: always \ No newline at end of file diff --git a/vars/vars.yml b/vars/vars.yml index 43ec1e2..e14f5f7 100644 --- a/vars/vars.yml +++ b/vars/vars.yml @@ -76,8 +76,8 @@ npm_letsencrypt: letsencrypt vol_db: postgres_db lemonldap_data: ldap_data lemonldap_cfg: ldap_cfg -lemonldap_perl: ldap_pearl lemonldap_lib: ldap_lib +lemonldap_nginx: ldap_nginx # -------------------------------------------------------------- # Paths on the target host (temporary files)