timmybee/travel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: timmybee:feature/dark-mode-default
Branches Tags
timmybee:master timmybee:fix/ldap-admin-email timmybee:fix/submit-draft-status timmybee:feature/town-sync timmybee:fix/ldap-bootstrap timmybee:feature/ldap-email-bootstrap timmybee:feature/dark-mode-default timmybee:worktree-ldap-issues timmybee:feature/bootstrap-theming timmybee:feature/phpldapadmin timmybee:fix/migration-order timmybee:fix/consolidate-docker-compose timmybee:test/test-pr
..
compare: timmybee:fix/ldap-bootstrap
Branches Tags
timmybee:master timmybee:fix/ldap-admin-email timmybee:fix/submit-draft-status timmybee:feature/town-sync timmybee:fix/ldap-bootstrap timmybee:feature/ldap-email-bootstrap timmybee:feature/dark-mode-default timmybee:worktree-ldap-issues timmybee:feature/bootstrap-theming timmybee:feature/phpldapadmin timmybee:fix/migration-order timmybee:fix/consolidate-docker-compose timmybee:test/test-pr

1 Commits
feature/da ... fix/ldap-b

Author SHA1 Message Date
Tim Basten
d59ec55999 Remove persistent LDAP volumes so bootstrap.ldif always applies on startup
All checks were successful
linter / quality (pull_request) Successful in 1m45s
Details
security / Dependency Audit (pull_request) Successful in 1m21s
Details
security / Static Analysis (pull_request) Successful in 2m11s
Details
tests / ci (8.4) (pull_request) Successful in 1m27s
Details
tests / ci (8.5) (pull_request) Successful in 2m21s
Details 
The osixia/openldap image only runs bootstrap LDIF when the database is
empty. Named volumes (sail-ldap-data, sail-ldap-config) caused changes
to bootstrap.ldif to be ignored after the first run. Removing these
volumes ensures the test LDAP directory is always seeded fresh from the
bootstrap file on each sail up.
 2026-03-06 04:02:18 +00:00
3 changed files with 2 additions and 8 deletions
Expand all files Collapse all files

6
compose.yaml
View File

@@ -97,8 +97,6 @@ services:
LDAP_READONLY_USER_USERNAME: '${LDAP_READONLY_USERNAME:-readonly}' LDAP_READONLY_USER_USERNAME: '${LDAP_READONLY_USERNAME:-readonly}'
LDAP_READONLY_USER_PASSWORD: '${LDAP_READONLY_PASSWORD:-readonly}' LDAP_READONLY_USER_PASSWORD: '${LDAP_READONLY_PASSWORD:-readonly}'
volumes: volumes:
- 'sail-ldap-data:/var/lib/ldap'
- 'sail-ldap-config:/etc/ldap/slapd.d'
- './docker/openldap/bootstrap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/bootstrap.ldif' - './docker/openldap/bootstrap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/bootstrap.ldif'
networks: networks:
- sail - sail
@@ -136,7 +134,3 @@ volumes:
driver: local driver: local
sail-redis: sail-redis:
driver: local driver: local
sail-ldap-data:
driver: local
sail-ldap-config:
driver: local

2
resources/views/components/layouts/app.blade.php
View File

@@ -1,6 +1,6 @@
<!doctype html> <!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
x-data="{ theme: localStorage.getItem('theme') || 'dark' }" x-data="{ theme: localStorage.getItem('theme') || 'light' }"
x-init="$watch('theme', val => { document.documentElement.setAttribute('data-bs-theme', val); localStorage.setItem('theme', val); }); document.documentElement.setAttribute('data-bs-theme', theme);" x-init="$watch('theme', val => { document.documentElement.setAttribute('data-bs-theme', val); localStorage.setItem('theme', val); }); document.documentElement.setAttribute('data-bs-theme', theme);"
:data-bs-theme="theme" :data-bs-theme="theme"
> >

2
resources/views/components/layouts/guest.blade.php
View File

@@ -1,6 +1,6 @@
<!doctype html> <!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
x-data="{ theme: localStorage.getItem('theme') || 'dark' }" x-data="{ theme: localStorage.getItem('theme') || 'light' }"
x-init="document.documentElement.setAttribute('data-bs-theme', theme);" x-init="document.documentElement.setAttribute('data-bs-theme', theme);"
:data-bs-theme="theme" :data-bs-theme="theme"
> >