Replace ROUTE_SERVER_NAME with HOSTNAME_FQDN

httpd.sh

@@ -4,8 +4,8 @@
 # -If file is provided as env variable, the config file in '/' is
 # overwrittern
 # - In any case, we replace the environment variables
-if [[ -z "$ROUTE_SERVER_NAME" ]]; then
-  export ROUTE_SERVER_NAME="https://${NAMESPACE}.web.cern.ch"
+if [[ -z "$HOSTNAME_FQDN" ]]; then
+  export HOSTNAME_FQDN="${NAMESPACE}.web.cern.ch"
 fi
 
 if [[ -n "$MAIN_CONF" ]]; then

shib.conf

@@ -26,7 +26,7 @@ PidFile /usr/local/httpd/httpd.pid
 Listen 8081
 ErrorLog /dev/stderr
 TransferLog /dev/stdout
-ServerName ${ROUTE_SERVER_NAME}
+ServerName https://HOSTNAME_FQDN
 
 #
 # Used for example style sheet in error templates.

shib.sh

 #!/bin/sh
 
+if [[ -z "$HOSTNAME_FQDN" ]]; then
+  export HOSTNAME_FQDN="${NAMESPACE}.web.cern.ch"
+fi
+
 if [[ -n "$SHIB_XML" ]]; then
   echo "$SHIB_XML" > /shibboleth2.xml
 fi