Merge pull request #4662 from IQSS/4661-fix-httpd

move docker-aio httpd.conf out of a directory excluded from version c…

conf/docker-aio/c7.dockerfile

@@ -10,7 +10,7 @@ COPY testdata/solrconfig.xml /tmp/dv
 # IPv6 and localhost appears to be related to some of the intermittant connection issues
 COPY disableipv6.conf /etc/sysctl.d/
 RUN rm /etc/httpd/conf/*
-COPY testdata/httpd.conf /etc/httpd/conf 
+COPY httpd.conf /etc/httpd/conf 
 RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.3.0dv.tgz 
 RUN cd /opt ; tar zxf /tmp/dv/deps/glassfish4dv.tgz
 

conf/docker-aio/httpd.conf

@@ -0,0 +1,30 @@
+
+Include conf.d/*.conf
+Include conf.modules.d/*.conf
+ServerName localhost
+Listen 80 443
+PidFile run/httpd.pid
+DocumentRoot "/var/www/html"
+TypesConfig /etc/mime.types
+User apache
+Group apache
+
+<VirtualHost *:80>
+  ServerName localhost
+  LogLevel debug
+ ErrorLog logs/error_log
+ LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+ CustomLog logs/access_log combined
+
+  # proxy config (aka - what to send to glassfish or not)
+  ProxyPassMatch ^/RApacheInfo$ !
+  ProxyPassMatch ^/custom !
+  ProxyPassMatch ^/dataexplore !
+  ProxyPassMatch ^/Shibboleth.sso !
+  ProxyPassMatch ^/shibboleth-ds !
+  # pass everything else to Glassfish
+  ProxyPass / ajp://localhost:8009/
+# glassfish can be slow sometimes
+  ProxyTimeout 300 
+
+</VirtualHost>