Skip to content

PBM fix LDAP group #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olexandr-havryliak merged 3 commits into from
Feb 12, 2025
Merged

PBM fix LDAP group #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ad5c54
PBM fix LDAP group
olexandr-havryliak Feb 12, 2025
84cd771
PSMDB do not fail on the first failure
olexandr-havryliak Feb 12, 2025
bca0ad0
Use latest openldap
olexandr-havryliak Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ services:
ldap-server:
container_name: ldap-server
hostname: ldap-server
image: bitnami/openldap:2
image: bitnami/openldap
environment:
- LDAP_ADMIN_USERNAME=admin
- LDAP_ADMIN_PASSWORD=adminpassword
Expand Down
2 changes: 1 addition & 1 deletion pmm_psmdb_diffauth_setup/init/setup_psmdb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ db.getSiblingDB("admin").createRole({
roles:[]
});
db.getSiblingDB("admin").createRole({
role: "cn=readers,ou=users,dc=example,dc=org",
role: "cn=readers,ou=groups,dc=example,dc=org",
privileges: [],
roles: [
{ role: "explainRole", db: "admin" },
Expand Down
3 changes: 2 additions & 1 deletion pmm_psmdb_diffauth_setup/test-auth.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ cat pki/private/pmm-test.key pki/issued/pmm-test.crt > certs/client.pem
find certs -type f -exec chmod 644 {} \;

#Start setup
docker compose -f docker-compose-pmm-psmdb.yml down -v --remove-orphans
docker compose -f docker-compose-pmm-psmdb.yml build
docker compose -f docker-compose-pmm-psmdb.yml up -d

Expand Down Expand Up @@ -68,7 +69,7 @@ done
tests=${TESTS:-yes}
if [ $tests = "yes" ]; then
echo "running tests"
output=$(docker compose -f docker-compose-pmm-psmdb.yml run test pytest -s -x --verbose test.py)
output=$(docker compose -f docker-compose-pmm-psmdb.yml run test pytest -s --verbose test.py)
else
echo "skipping tests"
fi
Expand Down
Loading