Added ENV var to set for SSL/TLS sites.

Author: admin

Dockerfile

@@ -6,7 +6,9 @@ MAINTAINER gabriel schubiner <[email protected]>
 RUN apt-get update && apt-get install -y --no-install-recommends \
     apache2 \
     libapache2-mod-php5 \
+    build-essential \
     php5 \
+    php5-dev \
     php5-mysqlnd \
     php5-imap \
     php5-cli \
@@ -25,8 +27,8 @@ RUN chmod +x /etc/cron.hourly/openatrium
 
 # Apache Cfg
 RUN rm -f /etc/apache2/sites-enabled/*
-ADD ./assets/apache.openatrium.conf /etc/apache2/sites-available/000-openatrium.conf
-RUN ln -s /etc/apache2/sites-available/000-openatrium.conf /etc/apache2/sites-enabled/000-openatrium.conf
+ADD assets/apache.openatrium.conf /etc/apache2/sites-available/
+RUN ln -s /etc/apache2/sites-available/apache.openatrium.conf /etc/apache2/sites-enabled/openatrium.conf
 RUN a2enmod rewrite
 
 # PHP Config
@@ -42,6 +44,9 @@ ADD ./assets/update_php_vars.sh /usr/bin/
 RUN chmod +x /usr/bin/update_php_vars.sh 
 RUN update_php_vars.sh
 RUN php5enmod imap
+RUN pecl install -Z uploadprogress && \
+    echo 'extension=uploadprogress.so' >/etc/php5/mods-available/uploadprogress.ini && \
+    php5enmod uploadprogress
 
 # Default ENV vars
 ## Apache

README.md

@@ -24,7 +24,6 @@ The relevant variables (with default settings) are:
 - SITE_MAIL [email protected]
 - INSTALL_SITE true
 
-
 ### Manual Installation
 For standard drupal/OA install procedure, you must access http://site-name.tld/install.php directly. Drupal won't redirect http://site-name.tld to the install page directly, because settings.php has been modified with database settings (assuming you linked an appropriate MariaDB/MySQL container. you did, right?)
 
@@ -123,14 +122,17 @@ At least that's the idea. Nobody's tested it yet.
   This tells init.sh not to fix permissions on the /var/www/html directory tree to drupal standard settings. Change to "true" to turn this off if you disagree with the permissions. Actual settings can be found in /etc/my_init.d/init.sh, but for a better description, they follow these guidelines:
 - https://www.drupal.org/node/244924 
 
-### INSTALL SITE
+### INSTALL SITE / DRUPAL
 - ACCOUNT_NAME admin
 - ACCOUNT_PASS insecurepass
 - ACCOUNT_MAIL [email protected]
 - SITE_NAME Open Atrium
 - SITE_MAIL [email protected]
 - INSTALL_SITE true
 
+- BASE_URL '' :: Sets `$base_url` in settings.php. If you're planning on using SSL/TLS, you'll want to set this to https://domain.tld 
+                 Note that there should be no trailing '/'. This will prevent mixed security warnings, and browsers may not load your sites resources--images, etc.
+
 ### EMAIL
 
 SSMTP_ROOT [email protected]

assets/init.sh

@@ -185,6 +185,14 @@ EOF
     popd
 }
 
+function set_site_base {
+    if [[ -n $BASE_URL ]]; then
+        echo "Setting site_base_name in settings.php"
+        sed -i -e 's/# $base_url .*/$base_url = '"$BASE_URL"'/' /var/www/html/sites/default/setttings.php
+        echo "Done"
+    fi
+}
+
 function check_ssh {
     echo "Checking SSH."
     if [[ $DISABLE_SSH == false ]]; then 
@@ -221,6 +229,7 @@ function bootstrap {
     else 
         echo "Either INSTALL_SITE (=$INSTALL_SITE) or AUTO_DB_SETTINGS (=$AUTO_DB_SETTINGS) is set to disallow automatic install."
     fi
+    set_site_base
     echo "Repairing Permissions to Drupal default"
     restore_permissions
     echo "Done bootstrapping container. Noted with /data/.bootstrap"