From: Arran Cudbard-Bell Date: Sat, 20 May 2023 06:32:23 +0000 (-0400) Subject: Fix references to freeradius-schema X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1baf36e4f96fee10ce3da30bd8a8748e0fce588;p=thirdparty%2Ffreeradius-server.git 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 b0d6c5dabc2..edc553e80af 100644 --- 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 4482fb96c8a..9620bf77ce7 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,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 ba406a4cc02..6bef4ff784f 100644 --- 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 14a90026419..f6b9184718c 100644 --- 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