Skip to content

Commit

Permalink
Fix itests for use with new ldap image
Browse files Browse the repository at this point in the history
  • Loading branch information
ViViDboarder committed Jan 22, 2025
1 parent daade33 commit f983cb3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ itest-up-anon:
build
docker compose -f docker-compose.yml \
-f itest/docker-compose.itest-anon.yml \
up -d vaultwarden ldap
up -d vaultwarden ldap ldap_admin

.PHONY: itest-run-anon
itest-run-anon:
Expand Down
8 changes: 0 additions & 8 deletions itest/config-anon.toml

This file was deleted.

21 changes: 0 additions & 21 deletions itest/docker-compose.itest-anon-env.yml

This file was deleted.

17 changes: 11 additions & 6 deletions itest/docker-compose.itest-anon.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
---
services:
ldap_sync:
volumes:
- ./itest/config-anon.toml:/config.toml:ro
environment:
CONFIG_PATH: ""
APP_VAULTWARDEN_URL: "http://vaultwarden:80"
APP_VAULTWARDEN_ADMIN_TOKEN: "admin"
APP_LDAP_HOST: "ldap"
APP_LDAP_SEARCH_BASE_DN: "dc=example,dc=org"
APP_LDAP_SEARCH_FILTER: "(&(objectClass=*)(uid=*))"
APP_LDAP_SYNC_LOOP: "false"

vaultwarden: {}

ldap:
command: ["--copy-service"]
volumes:
- ./itest/ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom
- ./itest/schema/anon.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/anon.ldif
environment:
# Just to make sure there is no accidental auth using merged configs
LDAP_ADMIN_PASSWORD: NONE
Empty file removed itest/ldif/anon.ldif
Empty file.
15 changes: 0 additions & 15 deletions itest/schema/anon.ldif

This file was deleted.

0 comments on commit f983cb3

Please sign in to comment.