KEYCLOAK-11728 New default hostname provider

fidgi · Nov 11, 2019 · 3784cef · 3784cef
1 parent 837e636
commit 3784cef
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/server/README.md b/server/README.md
@@ -392,8 +392,16 @@ Keycloak supports vault implementation for [Kubernetes secrets](https://kubernet
 
 ## Misc
 
+### Specify frontend base URL
+
+To set a fixed base URL for frontend requests use the following environment value (this is highly recommended in production):
+
+* `KEYCLOAK_FRONTEND_URL`: Specify base URL for Keycloak (optional, default is retrieved from request)
+
 ### Specify hostname
 
+This environment variable is deprecated, use `KEYCLOAK_FRONTEND_URL` instead. 
+
 To set a fixed hostname for Keycloak use the following environment value. This is highly recommended in production.
 
 * `KEYCLOAK_HOSTNAME`: Specify hostname for Keycloak (optional, default is retrieved from request, recommended in production)

diff --git a/server/tools/cli/hostname.cli b/server/tools/cli/hostname.cli
@@ -1,5 +1,2 @@
-/subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="${keycloak.hostname.provider:request}")
-/subsystem=keycloak-server/spi=hostname/provider=fixed:write-attribute(name=properties.hostname,value="${keycloak.hostname.fixed.hostname:localhost}")
-/subsystem=keycloak-server/spi=hostname/provider=fixed:write-attribute(name=properties.httpPort,value="${keycloak.hostname.fixed.httpPort:-1}")
-/subsystem=keycloak-server/spi=hostname/provider=fixed:write-attribute(name=properties.httpsPort,value="${keycloak.hostname.fixed.httpsPort:-1}")
-/subsystem=keycloak-server/spi=hostname/provider=fixed:write-attribute(name=properties.alwaysHttps,value="${keycloak.hostname.fixed.alwaysHttps:false}")
+/subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="${keycloak.hostname.provider:default}")
+/subsystem=keycloak-server/spi=hostname/provider=fixed/:add(properties={hostname => "${keycloak.hostname.fixed.hostname:localhost}",httpPort => "${keycloak.hostname.fixed.httpPort:-1}",httpsPort => "${keycloak.hostname.fixed.httpsPort:-1}",alwaysHttps => "${keycloak.hostname.fixed.alwaysHttps:false}"},enabled=true)
diff --git a/server/tools/docker-entrypoint.sh b/server/tools/docker-entrypoint.sh
@@ -26,6 +26,8 @@ file_env() {
     unset "$fileVar"
 }
 
+SYS_PROPS=""
+
 ##################
 # Add admin user #
 ##################
@@ -41,8 +43,12 @@ fi
 # Hostname #
 ############
 
+if [ "$KEYCLOAK_FRONTEND_URL" != "" ]; then
+    SYS_PROPS+="-Dkeycloak.frontendUrl=$KEYCLOAK_FRONTEND_URL"
+fi
+
 if [ "$KEYCLOAK_HOSTNAME" != "" ]; then
-    SYS_PROPS="-Dkeycloak.hostname.provider=fixed -Dkeycloak.hostname.fixed.hostname=$KEYCLOAK_HOSTNAME"
+    SYS_PROPS+="-Dkeycloak.hostname.provider=fixed -Dkeycloak.hostname.fixed.hostname=$KEYCLOAK_HOSTNAME"
 
     if [ "$KEYCLOAK_HTTP_PORT" != "" ]; then
         SYS_PROPS+=" -Dkeycloak.hostname.fixed.httpPort=$KEYCLOAK_HTTP_PORT"