diff --git a/dex.yml b/dex.yml index 0d4cbb6..76ca6cb 100755 --- a/dex.yml +++ b/dex.yml @@ -42,9 +42,9 @@ dex_ldap_user_base_dn: dc=eom,dc=dev dex_ldap_user_filter: "(&(objectClass=posixAccount)(memberOf=cn=Dex Users,ou=Dex,ou=Services,dc=eom,dc=dev))" dex_ldap_id_attribute: uid - dex_ldap_name_attribute: givenName + dex_ldap_name_attribute: cn dex_ldap_group_base_dn: dc=eom,dc=dev - dex_ldap_group_user_attribute: cn + dex_ldap_group_user_attribute: DN dex_ldap_group_filter: "(objectClass=groupOfUniqueNames)" dex_matrix_client_enabled: true diff --git a/roles/ericomeehan.dex b/roles/ericomeehan.dex index 6de8385..fa17989 160000 --- a/roles/ericomeehan.dex +++ b/roles/ericomeehan.dex @@ -1 +1 @@ -Subproject commit 6de8385829e4cb2ebb7bffec753df44651a02119 +Subproject commit fa17989fedc706ba1f5a516bf797f3e4ea3af1dc diff --git a/roles/ericomeehan.gitea b/roles/ericomeehan.gitea index 9f46e92..5702010 160000 --- a/roles/ericomeehan.gitea +++ b/roles/ericomeehan.gitea @@ -1 +1 @@ -Subproject commit 9f46e92cd762dd25e1cc23d978a5de669af97b0d +Subproject commit 5702010a3d9993ab840c39e77b3d07d515ca0d0d diff --git a/roles/ericomeehan.mastodon b/roles/ericomeehan.mastodon index bf0b82e..1c80554 160000 --- a/roles/ericomeehan.mastodon +++ b/roles/ericomeehan.mastodon @@ -1 +1 @@ -Subproject commit bf0b82efa31f25aa5b2db3df2fdd959f2b76df2c +Subproject commit 1c80554eef84ed5fd6b7f59c42f191541a6c71a6 diff --git a/roles/ericomeehan.matrix-stack b/roles/ericomeehan.matrix-stack index b9395a8..6497d19 160000 --- a/roles/ericomeehan.matrix-stack +++ b/roles/ericomeehan.matrix-stack @@ -1 +1 @@ -Subproject commit b9395a88ef52c406beeacb550e85c9218b572908 +Subproject commit 6497d19d558563f9fc200df3aa4ef4c63bd0f079 diff --git a/roles/ericomeehan.peertube b/roles/ericomeehan.peertube index bdfa224..b0ffdc3 160000 --- a/roles/ericomeehan.peertube +++ b/roles/ericomeehan.peertube @@ -1 +1 @@ -Subproject commit bdfa22498a7850c9decdce52b49b5e883fd2515f +Subproject commit b0ffdc3e8969ab6d1c0fb4812c89c1428d106650 diff --git a/roles/ericomeehan.www b/roles/ericomeehan.www index 827ec93..ab6dbac 160000 --- a/roles/ericomeehan.www +++ b/roles/ericomeehan.www @@ -1 +1 @@ -Subproject commit 827ec936632082cdd5ab46565785b39bc12711cf +Subproject commit ab6dbac3fd388d39fe5cb090111483fec742f356 diff --git a/www.yaml b/www.yaml index 7640754..e6a81a7 100644 --- a/www.yaml +++ b/www.yaml @@ -32,13 +32,14 @@ DEX_ISSUER: https://dex.eom.dev/ DEX_CLIENT_ID: www-membership DEX_CONNECTOR_ID: ldap - LDAP_URL: ldaps://192.168.1.165 - LDAP_BIND_DN: "cn=readwrite,dc=eom,dc=dev" - LDAP_ACCOUNT_BASE_DN: ou=People,dc=example,dc=com - LDAP_SEARCH_BASE_DN: dc=example,dc=com + LDAP_URL: ldap://openldap.openldap.svc.cluster.local + LDAP_BIND_DN: "cn=admin,dc=eom,dc=dev" + LDAP_ACCOUNT_BASE_DN: ou=People,dc=eom,dc=dev + LDAP_SEARCH_BASE_DN: dc=eom,dc=dev LDAP_PASSWORD_SCHEME: "{ARGON2}" - LDAP_GROUP_PLACEHOLDER_DN: cn=membership-sentinel,ou=system,dc=example,dc=com + LDAP_GROUP_PLACEHOLDER_DN: cn=placeholder,ou=Memberships,dc=eom,dc=dev LDAP_CA_CERT_FILE: "" + LDAP_ALLOW_INSECURE: "1" EMAIL_HOST: "postfix.eom.dev" EMAIL_PORT: "587" EMAIL_HOST_USER: "accounts@eom.dev"