Merge pull request #359 from continuouspipe/feature/magento1-public-location-auto

Replace magento1 APP_HOSTNAME/PUBLIC_ADDRESS with more standard autom…

Author: kierenevans

magento1/README.md

@@ -76,8 +76,9 @@ Variable | Description | Expected values | Default
 --- | --- | --- | ----
 PHP_MEMORY_LIMIT | PHP memory limit | - | 768M
 PRODUCTION_ENVIRONMENT | If true, magento DI will be compiled | true/false | false
-APP_HOSTNAME | Web server's host name | \<projectname\>.docker | magento.docker
-PUBLIC_ADDRESS | Magento base URL. Note that an underscore should not be used due to magento admin login using PHP's filter_var to check for domain validity. "_" is not a valid character in a domain name. |  https://\<projectname\>.docker/ | https://magento.docker/
+WEB_HOST | Web server's host name | \<projectname\>.docker | magento.docker
+PUBLIC_ADDRESS_UNSECURE | Magento unsecure base URL. Note that an underscore should not be used due to magento admin login using PHP's filter_var to check for domain validity. "_" is not a valid character in a domain name. |  https://\<projectname\>.docker/ | https://$WEB_HOST/
+PUBLIC_ADDRESS_SECURE | Magento secure base URL. Note that an underscore should not be used due to magento admin login using PHP's filter_var to check for domain validity. "_" is not a valid character in a domain name. |  https://\<projectname\>.docker/ | https://$WEB_HOST/
 FORCE_DATABASE_DROP | Drops the existing database before importing from assets | true/false | false
 DATABASE_NAME | Magento database name | - | magentodb
 DATABASE_USER | Magento database user | - | magento

magento1/usr/local/share/env/30-framework

@@ -7,8 +7,12 @@ export MAGE_ROOT=${MAGE_ROOT:-${WEB_DIRECTORY}}
 PRODUCTION_ENVIRONMENT=${PRODUCTION_ENVIRONMENT:-false}
 PRODUCTION_ENVIRONMENT="$(convert_to_boolean_string "$PRODUCTION_ENVIRONMENT")"
 export PRODUCTION_ENVIRONMENT
-export APP_HOSTNAME=${APP_HOSTNAME:-magento1.dev}
-export PUBLIC_ADDRESS=${PUBLIC_ADDRESS:-https://magento.docker/}
+
+if [ -n "${APP_HOSTNAME:-}" ]; then
+  echo 'deprecated: APP_HOSTNAME is deprecated, please use WEB_HOST instead' >&2
+  export WEB_HOST="${APP_HOSTNAME}"
+fi
+export WEB_HOST=${WEB_HOST:-magento.docker}
 
 FORCE_DATABASE_DROP=${FORCE_DATABASE_DROP:-false}
 FORCE_DATABASE_DROP="$(convert_to_boolean_string "$FORCE_DATABASE_DROP")"

magento1/usr/local/share/env/60-framework

@@ -4,3 +4,28 @@
 if ! [[ "$MAGE_ROOT" =~ ^/ ]]; then
   export MAGE_ROOT=${WORK_DIRECTORY}/${MAGE_ROOT}
 fi
+
+if [ "$WEB_HTTPS_ONLY" == "true" ]; then
+  PUBLIC_ADDRESS_UNSECURE_SCHEME=https
+else
+  PUBLIC_ADDRESS_UNSECURE_SCHEME=http
+fi
+
+if [ "$WEB_HTTPS" == "true" ] || [ "$WEB_HTTPS_OFFLOADED" == "true" ] || [ "$WEB_REVERSE_PROXIED" == "true" ]; then
+  PUBLIC_ADDRESS_SECURE_SCHEME=https
+else
+  PUBLIC_ADDRESS_SECURE_SCHEME=http
+fi
+
+if [ -n "${PUBLIC_ADDRESS:-}" ]; then
+  echo 'deprecated: PUBLIC_ADDRESS is deprecated, please set WEB_HOST or PUBLIC_ADDRESS_UNSECURE/PUBLIC_ADDRESS_SECURE instead' >&2
+
+  export PUBLIC_ADDRESS_UNSECURE=${PUBLIC_ADDRESS_UNSECURE:-$PUBLIC_ADDRESS}
+  export PUBLIC_ADDRESS_SECURE=${PUBLIC_ADDRESS_SECURE:-$PUBLIC_ADDRESS}
+else
+  export PUBLIC_ADDRESS_UNSECURE=${PUBLIC_ADDRESS_UNSECURE:-$PUBLIC_ADDRESS_UNSECURE_SCHEME://$WEB_HOST/}
+  export PUBLIC_ADDRESS_SECURE=${PUBLIC_ADDRESS_SECURE:-$PUBLIC_ADDRESS_SECURE_SCHEME://$WEB_HOST/}
+
+  # for deprecated BC
+  export PUBLIC_ADDRESS=${PUBLIC_ADDRESS_SECURE}
+fi

magento1/usr/local/share/magento1/magento_functions.sh

@@ -50,8 +50,8 @@ function do_replace_core_config_values() {
   local SQL
   SQL="DELETE from core_config_data WHERE path LIKE 'web/%base_url';
   DELETE from core_config_data WHERE path LIKE 'system/full_page_cache/varnish%';
-  INSERT INTO core_config_data VALUES (NULL, 'default', '0', 'web/unsecure/base_url', '$PUBLIC_ADDRESS');
-  INSERT INTO core_config_data VALUES (NULL, 'default', '0', 'web/secure/base_url', '$PUBLIC_ADDRESS');
+  INSERT INTO core_config_data VALUES (NULL, 'default', '0', 'web/unsecure/base_url', '$PUBLIC_ADDRESS_UNSECURE');
+  INSERT INTO core_config_data VALUES (NULL, 'default', '0', 'web/secure/base_url', '$PUBLIC_ADDRESS_SECURE');
   INSERT INTO core_config_data VALUES (NULL, 'default', '0', 'system/full_page_cache/varnish/access_list', 'varnish');
   INSERT INTO core_config_data VALUES (NULL, 'default', '0', 'system/full_page_cache/varnish/backend_host', 'varnish');
   INSERT INTO core_config_data VALUES (NULL, 'default', '0', 'system/full_page_cache/varnish/backend_port', '80');