From f86e6d73803dc9958bbe67d0685636853988c5e6 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Fri, 14 Jun 2024 16:51:56 -0400 Subject: [PATCH] GUACAMOLE-1020: Add Docker mapping for the restrict extension module. --- guacamole-docker/build.d/000-build-and-install-guacamole.sh | 2 +- guacamole-docker/build.d/010-map-guacamole-extensions.sh | 3 ++- guacamole-docker/build.d/020-download-drivers.sh | 2 +- guacamole-docker/entrypoint.d/700-configure-features.sh | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/guacamole-docker/build.d/000-build-and-install-guacamole.sh b/guacamole-docker/build.d/000-build-and-install-guacamole.sh index 8c9c772038..e20d87b2d2 100644 --- a/guacamole-docker/build.d/000-build-and-install-guacamole.sh +++ b/guacamole-docker/build.d/000-build-and-install-guacamole.sh @@ -18,7 +18,7 @@ # ## -## @fn 010-build-and-install-guacamole.sh +## @fn 000-build-and-install-guacamole.sh ## ## Builds the Guacamole web application and all main extensions, installing the ## resulting binaries to standard locations within the Docker image. After the diff --git a/guacamole-docker/build.d/010-map-guacamole-extensions.sh b/guacamole-docker/build.d/010-map-guacamole-extensions.sh index de12262aee..45a344c137 100644 --- a/guacamole-docker/build.d/010-map-guacamole-extensions.sh +++ b/guacamole-docker/build.d/010-map-guacamole-extensions.sh @@ -18,7 +18,7 @@ # ## -## @fn 020-map-guacamole-extensions.sh +## @fn 010-map-guacamole-extensions.sh ## ## Maps all installed Guacamole extensions (built in a previous step) to their ## corresponding environment variable prefixes, adding symbolic links so that @@ -106,6 +106,7 @@ map_extensions <<'EOF' guacamole-auth-ldap.........................LDAP_ guacamole-auth-quickconnect.................QUICKCONNECT_ guacamole-auth-radius.......................RADIUS_ + guacamole-auth-restrict.....................RESTRICT_ guacamole-auth-sso/cas......................CAS_ guacamole-auth-sso/openid...................OPENID_ guacamole-auth-sso/saml.....................SAML_ diff --git a/guacamole-docker/build.d/020-download-drivers.sh b/guacamole-docker/build.d/020-download-drivers.sh index 6613dc3a26..a5fe6c7787 100644 --- a/guacamole-docker/build.d/020-download-drivers.sh +++ b/guacamole-docker/build.d/020-download-drivers.sh @@ -18,7 +18,7 @@ # ## -## @fn 030-download-drivers.sh +## @fn 020-download-drivers.sh ## ## Downloads all JDBC drivers required by the various supported databases. Each ## downloaded driver is stored beneath /opt/guacamole/drivers, with symbolic diff --git a/guacamole-docker/entrypoint.d/700-configure-features.sh b/guacamole-docker/entrypoint.d/700-configure-features.sh index f1a2b1a43b..cc7ad0e24e 100644 --- a/guacamole-docker/entrypoint.d/700-configure-features.sh +++ b/guacamole-docker/entrypoint.d/700-configure-features.sh @@ -19,7 +19,7 @@ # ## -## @fn 800-configure-features.sh +## @fn 700-configure-features.sh ## ## Automatically checks all environment variables currently set and performs ## configuration tasks related to those variabels, including installing any