From eecf97ab525acd2c1789b92e400acc9080db74d8 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Thu, 8 Sep 2016 10:02:39 -0400 Subject: [PATCH] Final fixups for Rino's work --- Dockerfile | 5 +---- conf/grouper.conf | 25 +++++++++++++++++++++++++ container_files/bin/configure.sh | 13 ------------- container_files/tmp/grouper-appliance | 2 ++ 4 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 conf/grouper.conf delete mode 100755 container_files/bin/configure.sh create mode 100644 container_files/tmp/grouper-appliance diff --git a/Dockerfile b/Dockerfile index 1774d69..02cf4ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ENV VERSION=$version ENV TOMCAT_VERSION="6.0.35" ADD ./container_files /opt/ +COPY conf/grouper.conf /etc/httpd/conf.d/grouper.conf COPY conf/grouper.hibernate.properties /opt/grouper/$version RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \ ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties && \ @@ -16,10 +17,6 @@ RUN rm /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.propert ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ws-2.3.0/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \ rm /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \ ln -s /opt/grouper/$version/grouper.hibernate.properties /opt/grouper/2.3.0/grouper.ui-2.3.0/dist/grouper/WEB-INF/classes/grouper.hibernate.properties -RUN echo "ProxyPass /grouper/ ajp://localhost:8009/grouper/ retry=0" >> /etc/httpd/conf/httpd.conf -RUN echo "ProxyPass /grouper-ws/ ajp://localhost:8009/grouper-ws/ retry=0" >> /etc/httpd/conf/httpd.conf -RUN echo "ProxyPass /examples/ ajp://localhost:8009/examples/ retry=0" >> /etc/httpd/conf/httpd.conf -RUN ls /root && ls -l /tmp && cat /opt/grouper/$version/grouper.hibernate.properties && cat /opt/grouper/$version/grouper.installer.properties VOLUME /opt/grouper/$version/apache-tomcat-$TOMCAT_VERSION/logs VOLUME /etc/httpd/logs diff --git a/conf/grouper.conf b/conf/grouper.conf new file mode 100644 index 0000000..a960344 --- /dev/null +++ b/conf/grouper.conf @@ -0,0 +1,25 @@ +Listen 443 + + ServerAlias grouper.your.institution.edu + + SSLEngine on + SSLCertificateFile /etc/httpd/certs/server.crt + SSLCertificateKeyFile /etc/httpd/certs/server.key + #SSLCertificateChainFile /etc/httpd/certs/your_bundle.pem + + SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:!aNULL:!MD5 + SSLHonorCipherOrder on + + ProxyRequests Off + ProxyVia Off + + + Require all granted + + + ProxyPreserveHost On + ProxyPass /grouper/ ajp://localhost:8009/grouper/ retry=0 + ProxyPass /grouper-ws/ ajp://localhost:8009/grouper-ws/ retry=0 + ProxyPass /examples/ ajp://localhost:8009/examples/ retry=0 + + \ No newline at end of file diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh deleted file mode 100755 index 9287e80..0000000 --- a/container_files/bin/configure.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -log="/tmp/grouper-configure.log" -date >> $log - -sed -i "s|#MYSQL_HOST#|$MYSQL_HOST|g" /opt/grouper/2.3.0/grouper.hibernate.properties - -sed -i "s|#MYSQL_USER#|$MYSQL_USER|g" /opt/grouper/2.3.0/grouper.hibernate.properties - -sed -i "s|#MYSQL_PASSWORD#|$MYSQL_PASSWORD|g" /opt/grouper/2.3.0/grouper.hibernate.properties - -sed -i "s|#MYSQL_DATABASE#|$MYSQL_DATABASE|g" /opt/grouper/2.3.0/grouper.hibernate.properties - -cat /opt/grouper/2.3.0/grouper.hibernate.properties > $log diff --git a/container_files/tmp/grouper-appliance b/container_files/tmp/grouper-appliance new file mode 100644 index 0000000..b67808a --- /dev/null +++ b/container_files/tmp/grouper-appliance @@ -0,0 +1,2 @@ +# The presence of this file indicates this container is +# part of a Grouper appliance. \ No newline at end of file