PROTO and URL_PREFIX settings

APSL · Jan 8, 2015 · 924000f · 924000f
1 parent ae69562
commit 924000f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -26,5 +26,11 @@ Env vars (default value shown)::
     -e DATABASE_HOST=172.17.42.1
     -e DATABASE_PORT=3306
 
-    -e DOMAIN=hostname      # Sets all hostnames config, default: container hostname.
-    -e BASE_URL=http://hostname # default: http://{{DOMAIN}}
+    -e DOMAIN=localhost    # Sets all hostnames config, default: container hostname.
+    -e PROTO=http
+    -e URL_PREFIX          # Default empty. If defined, must begin (but not end) with "/".
+                           # example:  -e URL_PREFIX=/mydrupal
+
+    # base_url drupal setting will be: {{PROTO}}://{{DOMAIN}}{{URL_PREFIX}}
+
+
diff --git a/apache-vhost.conf.tpl b/apache-vhost.conf.tpl
@@ -3,6 +3,9 @@
     ServerName {{ DOMAIN | default("localhost") }}
     ErrorLog /app/logs/drupal-error.log
     CustomLog /app/logs/drupal-access.log common
+    {% if URL_PREFIX  %}
+    Alias {{URL_PREFIX}} /app/www
+    {% endif %}
 
     <Directory /app/www>
         Options  Indexes FollowSymLinks MultiViews
@@ -26,4 +29,4 @@
         order deny,allow
         deny from all
     </FilesMatch>
-</VirtualHost>
+</VirtualHost>
diff --git a/settings.php.tpl b/settings.php.tpl
@@ -14,11 +14,8 @@ $databases['default']['default'] = array(
 $update_free_access = FALSE;
 $drupal_hash_salt = '{{ DRUPAL_HASH_SALT }}';
 
-{% if BASE_URL is defined %}
-$base_url = '{{ BASE_URL }}';  // NO trailing slash!
-{% else %}
-$base_url = 'http://{{ DOMAIN }}';  // NO trailing slash!
-{% endif %}
+// generated by container conf template
+$base_url = '{{PROTO|default("http")}}://{{DOMAIN|default("localhost")}}{{URL_PREFIX|default("")}}';
 
 ini_set('session.gc_probability', 1);
 ini_set('session.gc_divisor', 100);