Skip to content

Commit

Permalink
Final fixups for Rino's work
Browse files Browse the repository at this point in the history
  • Loading branch information
Jim Van Fleet committed Sep 8, 2016
1 parent 0fad771 commit eecf97a
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 17 deletions.
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,14 @@ 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 && \
rm /opt/grouper/2.3.0/grouper.ws-2.3.0/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
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
25 changes: 25 additions & 0 deletions conf/grouper.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Listen 443
<VirtualHost *: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

<Proxy *>
Require all granted
</Proxy>

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

</VirtualHost>
13 changes: 0 additions & 13 deletions container_files/bin/configure.sh

This file was deleted.

2 changes: 2 additions & 0 deletions container_files/tmp/grouper-appliance
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# The presence of this file indicates this container is
# part of a Grouper appliance.

0 comments on commit eecf97a

Please sign in to comment.