diff --git a/group_vars/all/07_applications.yml b/group_vars/all/07_applications.yml index 8b7fae5b..099ece8a 100644 --- a/group_vars/all/07_applications.yml +++ b/group_vars/all/07_applications.yml @@ -234,7 +234,7 @@ defaults_applications: network: local: True # Activates local network to allow other docker containers to connect public: False # Set to true in inventory file if you want to expose the LDAP port to the internet - hostname: "openldap" # Hostname of the LDAP Server in the central_ldap network + hostname: "ldap" # Hostname of the LDAP Server in the central_ldap network webinterface: "lam" # The webinterface which should be used. Possible: lam and phpldapadmin users: administrator: diff --git a/group_vars/all/11_iam.yml b/group_vars/all/11_iam.yml index 0e5c29ac..a4d14444 100644 --- a/group_vars/all/11_iam.yml +++ b/group_vars/all/11_iam.yml @@ -24,7 +24,7 @@ defaults_oidc: logout_url: "{{_oidc_client_issuer_url}}/protocol/openid-connect/logout" # Endpoint to log out the user change_credentials: "{{_oidc_client_issuer_url}}account/account-security/signing-in" # URL for managing or changing user credentials certs: "{{_oidc_client_issuer_url}}/protocol/openid-connect/certs" # JSON Web Key Set (JWKS) - button_text: "SSO Login({{primary_domain | upper}})" # Default button text + button_text: "SSO Login ({{primary_domain | upper}})" # Default button text attributes: # Attribut to identify the user username: "preferred_username" diff --git a/roles/docker-bigbluebutton/tasks/main.yml b/roles/docker-bigbluebutton/tasks/main.yml index 9fc81837..a1d847cf 100644 --- a/roles/docker-bigbluebutton/tasks/main.yml +++ b/roles/docker-bigbluebutton/tasks/main.yml @@ -38,6 +38,7 @@ src: "{{ bbb_env_file_origine }}" dest: "{{ bbb_env_file_link }}" state: link + notify: setup bigbluebutton - name: flush docker service meta: flush_handlers diff --git a/roles/docker-compose/Administration.md b/roles/docker-compose/Administration.md index 54f7b69e..1376645b 100644 --- a/roles/docker-compose/Administration.md +++ b/roles/docker-compose/Administration.md @@ -10,4 +10,10 @@ docker compose down -v ```bash watch -n 2 "docker compose ps -a" +``` + +## Health Logs + +```bash +docker inspect --format='{{json .State.Health}}' ``` \ No newline at end of file diff --git a/roles/docker-discourse/Administration.md b/roles/docker-discourse/Administration.md index e5c7a6d0..db4a987c 100644 --- a/roles/docker-discourse/Administration.md +++ b/roles/docker-discourse/Administration.md @@ -1,8 +1,17 @@ -# Administration +# Administration Notes ## Check configuration + ```bash ./launcher enter application pry(main)> SiteSetting.all.each { |setting| puts "#{setting.name}: #{setting.value}" } ``` ---- \ No newline at end of file +--- + +## Reinitialize Container + +To reinitialize the container execute: + +```bash +docker network connect discourse_default central-postgres && ./launcher rebuild discourse_application +``` \ No newline at end of file diff --git a/roles/docker-ldap/Change_DN.md b/roles/docker-ldap/Change_DN.md index 06047edb..a034de70 100644 --- a/roles/docker-ldap/Change_DN.md +++ b/roles/docker-ldap/Change_DN.md @@ -1,6 +1,3 @@ -Here is the full content in English with all instructions, formatted as a markdown (`CHANGE_DN.md`) file: - -```md # Change Distinguished Name (DN) in OpenLDAP Docker This document provides a step-by-step guide on how to rename the Distinguished Name (DN) from `cn=administrator,dc=flock,dc=town` to `cn=administrator,dc=cymais,dc=cloud` in an **OpenLDAP Docker** environment. @@ -133,7 +130,4 @@ Restart the OpenLDAP container if necessary: docker restart openldap ``` -Now, `cn=administrator,dc=cymais,dc=cloud` should be active as the new administrator account. -``` - -This file contains the complete set of instructions in English, properly formatted, and ready to be used in OpenLDAP Docker. Let me know if you need any adjustments! 🚀 \ No newline at end of file +Now, `cn=administrator,dc=cymais,dc=cloud` should be active as the new administrator account. \ No newline at end of file diff --git a/roles/docker-ldap/Installation.md b/roles/docker-ldap/Installation.md index 76199fe8..6f4f9d72 100644 --- a/roles/docker-ldap/Installation.md +++ b/roles/docker-ldap/Installation.md @@ -30,6 +30,6 @@ EOF ### Verifiy that MemberOf is activated and loaded ```bash -docker exec -it openldap sh -c 'ls -l /opt/bitnami/openldap/lib/openldap/memberof.*' +docker exec -it ldap sh -c 'ls -l /opt/bitnami/openldap/lib/openldap/memberof.*' docker exec -it openldap ldapsearch -Y EXTERNAL -H ldapi:/// -b cn=config '(&(objectClass=olcOverlayConfig)(olcOverlay=memberof))' ``` diff --git a/roles/docker-ldap/TODO.md b/roles/docker-ldap/TODO.md new file mode 100644 index 00000000..e2889106 --- /dev/null +++ b/roles/docker-ldap/TODO.md @@ -0,0 +1,3 @@ +# Todos +- Implement auto password hash +- Implement auto memberof setup \ No newline at end of file diff --git a/roles/docker-ldap/handlers/main.yml b/roles/docker-ldap/handlers/main.yml index bf230859..b5082c48 100644 --- a/roles/docker-ldap/handlers/main.yml +++ b/roles/docker-ldap/handlers/main.yml @@ -1,6 +1,6 @@ - name: Load memberof module from file in OpenLDAP container shell: > - docker exec -i openldap ldapmodify -Y EXTERNAL -H ldapi:/// -f {{ldif_docker_path}}01_member_of_configuration.ldif + docker exec -i {{ applications[application_id].hostname }} ldapmodify -Y EXTERNAL -H ldapi:/// -f {{ldif_docker_path}}01_member_of_configuration.ldif listen: "Import LDIF files" # @todo Remove the following ignore errors when setting up a new server # Just here because debugging would take to much time @@ -8,7 +8,7 @@ - name: Refint Module Activation for OpenLDAP shell: > - docker exec -i openldap ldapadd -Y EXTERNAL -H ldapi:/// -f {{ldif_docker_path}}02_member_of_configuration.ldif + docker exec -i {{ applications[application_id].hostname }} ldapadd -Y EXTERNAL -H ldapi:/// -f {{ldif_docker_path}}02_member_of_configuration.ldif listen: "Import LDIF files" register: ldapadd_result failed_when: ldapadd_result.rc not in [0, 68] @@ -18,7 +18,7 @@ - name: Refint Overlay Configuration for OpenLDAP shell: > - docker exec -i openldap ldapmodify -Y EXTERNAL -H ldapi:/// -f {{ldif_docker_path}}03_member_of_configuration.ldif + docker exec -i {{ applications[application_id].hostname }} ldapmodify -Y EXTERNAL -H ldapi:/// -f {{ldif_docker_path}}03_member_of_configuration.ldif listen: "Import LDIF files" register: ldapadd_result failed_when: ldapadd_result.rc not in [0, 68] @@ -28,7 +28,7 @@ - name: "Import users, groups, etc. to LDAP" shell: > - docker exec -i openldap ldapadd -x -D "{{ldap.dn.administrator}}" -w "{{ldap.bind_credential}}" -c -f "{{ldif_docker_path}}data/{{ item | basename | regex_replace('\.j2$', '') }}" + docker exec -i {{ applications[application_id].hostname }} ldapadd -x -D "{{ldap.dn.administrator}}" -w "{{ldap.bind_credential}}" -c -f "{{ldif_docker_path}}data/{{ item | basename | regex_replace('\.j2$', '') }}" register: ldapadd_result changed_when: "'adding new entry' in ldapadd_result.stdout" failed_when: ldapadd_result.rc not in [0, 20, 68] @@ -37,7 +37,7 @@ - name: "Import schemas" shell: > - docker exec -i openldap ldapadd -Y EXTERNAL -H ldapi:/// -f "{{ldif_docker_path}}schema/{{ item | basename | regex_replace('\.j2$', '') }}" + docker exec -i {{ applications[application_id].hostname }} ldapadd -Y EXTERNAL -H ldapi:/// -f "{{ldif_docker_path}}schema/{{ item | basename | regex_replace('\.j2$', '') }}" register: ldapadd_result changed_when: "'adding new entry' in ldapadd_result.stdout" failed_when: ldapadd_result.rc not in [0, 80] diff --git a/roles/docker-ldap/templates/docker-compose.yml.j2 b/roles/docker-ldap/templates/docker-compose.yml.j2 index 5f522b29..a33e3333 100644 --- a/roles/docker-ldap/templates/docker-compose.yml.j2 +++ b/roles/docker-ldap/templates/docker-compose.yml.j2 @@ -4,7 +4,7 @@ services: application: image: bitnami/openldap:{{ applications[application_id].version }} - container_name: {{ application_id }} + container_name: {{ applications[application_id].hostname }} {% include 'roles/docker-compose/templates/services/base.yml.j2' %} {% if applications[application_id].network.public | bool %} ports: