Merge pull request #6 from movabletype/feature-ssi

Enable mod_include if available

Author: usualoma

mt/docker-entrypoint.sh

@@ -4,40 +4,56 @@ chmod 777 /var/www/html
 chmod 777 /var/www/cgi-bin/mt/mt-static/support
 chmod 777 /var/www/cgi-bin/mt/themes
 
+conf_dirs="/etc/httpd/conf.d /etc/apache2/conf-enabled /etc/httpd/conf/extra"
+module_dirs="/usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules"
+
 if [ "$1" = "apache2-foreground" ]; then
     rm -f /var/log/apache2/access.log # disable access logging
 
-    httpd_conf_d=`ls -d /etc/httpd/conf.d /etc/apache2/conf-enabled /etc/httpd/conf/extra 2>/dev/null | head -1`
+    httpd_conf_d=`ls -d $conf_dirs 2>/dev/null | head -1`
     cat > $httpd_conf_d/mt.conf <<CONF
 Timeout 3600
 
 # mt-static
 Alias /mt-static/ /var/www/cgi-bin/mt/mt-static/
 CONF
 
-    mod_rewrite_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_rewrite.so' 2>/dev/null | head -1`
+    mod_rewrite_so=`find $module_dirs -name 'mod_rewrite.so' 2>/dev/null | head -1`
     if [ -n "$mod_rewrite_so" ]; then
         cat > $httpd_conf_d/mt-rewrite.conf <<CONF
 LoadModule rewrite_module $mod_rewrite_so
 CONF
     fi
 
-    mod_proxy_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_proxy.so' 2>/dev/null | head -1`
+    mod_proxy_so=`find $module_dirs -name 'mod_proxy.so' 2>/dev/null | head -1`
     if [ -n "$mod_proxy_so" ]; then
         cat > $httpd_conf_d/mt-proxy.conf <<CONF
 LoadModule proxy_module $mod_proxy_so
 ProxyPassReverse / http://mt/
 CONF
     fi
 
-    mod_proxy_http_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_proxy_http.so' 2>/dev/null | head -1`
+    mod_proxy_http_so=`find $module_dirs -name 'mod_proxy_http.so' 2>/dev/null | head -1`
     if [ -n "$mod_proxy_http_so" ]; then
         cat > $httpd_conf_d/mt-proxy_http.conf <<CONF
 LoadModule proxy_http_module $mod_proxy_http_so
 ProxyPassReverse / http://mt/
 CONF
     fi
 
+    mod_include_so=`find $module_dirs -name 'mod_include.so' 2>/dev/null | head -1`
+    if [ -n "$mod_include_so" ]; then
+        cat > $httpd_conf_d/mt-include.conf <<CONF
+LoadModule include_module /usr/lib/apache2/modules/mod_include.so
+<Directory /var/www/html>
+<IfModule mod_include.c>
+Options +Includes
+AddOutputFilter INCLUDES .html
+</IfModule>
+</Directory>
+CONF
+    fi
+
     if [ $httpd_conf_d = "/etc/httpd/conf/extra" ]; then
         # archlinux
         cat >> /etc/httpd/conf/httpd.conf <<CONF
@@ -57,12 +73,12 @@ CONF
         exec /usr/sbin/httpd -D FOREGROUND
     fi
 else
-    httpd_conf_d=`ls -d /etc/httpd/conf.d /etc/apache2/conf-enabled /etc/httpd/conf/extra 2>/dev/null | head -1`
+    httpd_conf_d=`ls -d $conf_dirs 2>/dev/null | head -1`
     cat > $httpd_conf_d/mt.conf <<CONF
 Timeout 3600
 CONF
 
-    mod_env_so=`find /usr/lib/apache2/modules /usr/lib64/httpd/modules /usr/lib/httpd/modules -name 'mod_env.so' 2>/dev/null | head -1`
+    mod_env_so=`find $module_dirs -name 'mod_env.so' 2>/dev/null | head -1`
     if [ -n "$mod_env_so" ]; then
         cat > $httpd_conf_d/mt-env.conf <<CONF
 LoadModule env_module $mod_env_so