Fix references to freeradius-schema

diff --git a/doc/antora/modules/concepts/pages/modules/ldap/authentication.adoc b/doc/antora/modules/concepts/pages/modules/ldap/authentication.adoc
index b0d6c5dabc2704d9cf164cc8d5dffa01633c525c..edc553e80af7fae8e775417c0472918ab0c50a4e 100644 (file)
--- a/doc/antora/modules/concepts/pages/modules/ldap/authentication.adoc
+++ b/doc/antora/modules/concepts/pages/modules/ldap/authentication.adoc
@@ -48,7 +48,7 @@ following recommendations for LDAP "best practices" security.
 
 * When storing RADIUS user profiles (quotas, `Simultaneous-Use` flags,
   access time restrictions, etc) in LDAP, the LDAP schema
-  `doc/schemas/ldap/openldap/freeradius.schema` must first be imported
+  `doc/schemas/ldap/openldap/freeradius-radius.schema` must first be imported
   into the LDAP server.
 
 == Authentication method compatibility

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 4482fb96c8a9ce2d55f0a71d9e1930176955ce0c..9620bf77ce76965619afc86a3a42eee897e25edc 100644 (file)
--- 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,7 @@ 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.schema:/container/service/slapd/assets/config/bootstrap/schema/mmc/radius.schema:ro" \
+       --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-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 ba406a4cc02d2ef491f973056fc7b930a1c76916..6bef4ff784f58a7f58b318fbfb772f8ce15c817f 100644 (file)
--- a/scripts/ci/ldap/slapd.conf
+++ b/scripts/ci/ldap/slapd.conf
@@ -10,7 +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.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 14a90026419be6433f63ea10629a920076cf791c..f6b9184718c3586e20bb90feec6825579cb280a9 100644 (file)
--- a/scripts/ci/ldap/slapd2.conf
+++ b/scripts/ci/ldap/slapd2.conf
@@ -10,7 +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.schema
+include         doc/schemas/ldap/openldap/freeradius-radius.schema
 include         doc/schemas/ldap/openldap/freeradius-clients.schema
 pidfile /tmp/slapd2.pid
 
@@ -37,7 +37,7 @@ authz-regexp
 
 #
 # Certificates for SSL/TLS connections
-# Note - these will not match the host name so clients need to use 
+# Note - these will not match the host name so clients need to use
 #        the "allow" option when checking certificates
 #
 TLSCACertificateFile /tmp/ldap2/certs/cacert.pem