From: Arran Cudbard-Bell Date: Sat, 20 May 2023 18:40:22 +0000 (-0400) Subject: ldap: We also need to load the new policy schema X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2317b3305fd96d39c07b532826d777d0e0eb8a82;p=thirdparty%2Ffreeradius-server.git ldap: We also need to load the new policy schema --- diff --git a/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc b/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc index 9620bf77ce7..173ef7ef6ff 100644 --- a/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc +++ b/doc/antora/modules/howto/pages/modules/ldap/bootstrap_openldap/docker.adoc @@ -48,7 +48,8 @@ docker run -it --rm -p 389:389 \ --env LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD} \ --env LDAP_READONLY_USER=true \ --env LDAP_READONLY_USER_PASSWORD=${LDAP_READONLY_PASSWORD} \ - --volume "${FREERADIUS_SRC}/doc/schemas/ldap/openldap/freeradius-radius.schema:/container/service/slapd/assets/config/bootstrap/schema/mmc/radius.schema:ro" \ + --volume "${FREERADIUS_SRC}/doc/schemas/ldap/openldap/freeradius-policy.schema:/container/service/slapd/assets/config/bootstrap/schema/mmc/freeradius-policy.schema:ro" \ + --volume "${FREERADIUS_SRC}/doc/schemas/ldap/openldap/freeradius-radius.schema:/container/service/slapd/assets/config/bootstrap/schema/mmc/freeradius-radius.schema:ro" \ --volume "${FREERADIUS_SRC}/doc/schemas/ldap/openldap/freeradius-clients.schema:/container/service/slapd/assets/config/bootstrap/schema/mmc/freeradius-clients.schema:ro" \ osixia/openldap:1.2.5 --copy-service ---- diff --git a/scripts/ci/ldap/slapd.conf b/scripts/ci/ldap/slapd.conf index 6bef4ff784f..14ee54eeb0e 100644 --- a/scripts/ci/ldap/slapd.conf +++ b/scripts/ci/ldap/slapd.conf @@ -10,6 +10,7 @@ include /tmp/ldap/schema/core.schema include /tmp/ldap/schema/cosine.schema include /tmp/ldap/schema/inetorgperson.schema include /tmp/ldap/schema/nis.schema +include doc/schemas/ldap/openldap/freeradius-policy.schema include doc/schemas/ldap/openldap/freeradius-radius.schema include doc/schemas/ldap/openldap/freeradius-clients.schema pidfile /tmp/slapd.pid diff --git a/scripts/ci/ldap/slapd2.conf b/scripts/ci/ldap/slapd2.conf index f6b9184718c..9733c2e6f09 100644 --- a/scripts/ci/ldap/slapd2.conf +++ b/scripts/ci/ldap/slapd2.conf @@ -10,6 +10,7 @@ include /tmp/ldap2/schema/core.schema include /tmp/ldap2/schema/cosine.schema include /tmp/ldap2/schema/inetorgperson.schema include /tmp/ldap2/schema/nis.schema +include doc/schemas/ldap/openldap/freeradius-policy.schema include doc/schemas/ldap/openldap/freeradius-radius.schema include doc/schemas/ldap/openldap/freeradius-clients.schema pidfile /tmp/slapd2.pid