Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'grouperappFix' into resolve-conflict
  • Loading branch information
Jim Van Fleet committed Sep 8, 2016
2 parents 0ec0362 + eecf97a commit fc40cee
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 42 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -8,3 +8,4 @@ bin/start.sh
bin/stop.sh
bin/test.sh
mysql
logs
30 changes: 13 additions & 17 deletions Dockerfile
Expand Up @@ -2,25 +2,21 @@ FROM bigfleet/grouper

ARG maintainer=my
ARG imagename=grouper
ARG version=$version
ARG version=2.3.0

LABEL Version=$version
ENV VERSION=$version
ENV TOMCAT_VERSION="6.0.35"

ENV MYSQL_DATABASE=grouper
ENV MYSQL_USER=grouper_user
ENV MYSQL_PASSWORD=3cf0ccc7d6b240390188367933c9cd90

ENV GROUPER_SYSTEM_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
ENV MYSQL_HOST=mariadb

ADD container_files /opt
RUN rm /opt/grouper/$version/grouper.apiBinary-$version/conf/grouper.hibernate.properties && \
ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/$version/grouper.apiBinary-$version/conf/grouper.hibernate.properties && \
rm /opt/grouper/$version/grouper.ws-$version/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/$version/grouper.ws-$version/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
rm /opt/grouper/$version/grouper.ui-$version/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \
ln -s /opt/etc/grouper.hibernate.properties /opt/grouper/$version/grouper.ui-$version/dist/grouper/WEB-INF/classes/grouper.hibernate.properties

#VOLUME /opt/grouper/$version/apache-tomcat-$TOMCAT_VERSION/logs
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

VOLUME /opt/grouper/$version/apache-tomcat-$TOMCAT_VERSION/logs
VOLUME /etc/httpd/logs
3 changes: 2 additions & 1 deletion conf/common.env
@@ -1,4 +1,5 @@
COMPOSE=true
MYSQL_DATABASE=grouper
MYSQL_USER=grouper_user
MYSQL_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
MYSQL_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
COMPOSE=true
25 changes: 25 additions & 0 deletions conf/grouper.conf
@@ -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>
1 change: 0 additions & 1 deletion conf/grouper.env
Expand Up @@ -2,4 +2,3 @@ VERSION=2.3.0
TOMCAT_VERSION=6.0.35
GROUPER_SYSTEM_PASSWORD=3cf0ccc7d6b240390188367933c9cd90
MYSQL_HOST=mariadb
WAIT_TIME=600
45 changes: 45 additions & 0 deletions conf/grouper.hibernate.properties
@@ -0,0 +1,45 @@
#
# Copyright 2014 Internet2
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

#
# Grouper Hibernate Configuration
# $Id: grouper.hibernate.example.properties,v 1.9 2009-08-11 20:18:09 mchyzer Exp $
#

# The grouper hibernate config uses Grouper Configuration Overlays (documented on wiki)
# By default the configuration is read from grouper.hibernate.base.properties
# (which should not be edited), and the grouper.hibernate.properties overlays
# the base settings. See the grouper.hibernate.base.properties for the possible
# settings that can be applied to the grouper.hibernate.properties

########################################
## DB settings
########################################

# e.g. mysql: jdbc:mysql://localhost:3306/grouper
# e.g. p6spy (log sql): [use the URL that your DB requires]
# e.g. oracle: jdbc:oracle:thin:@server.school.edu:1521:sid
# e.g. hsqldb (a): jdbc:hsqldb:dist/run/grouper;create=true
# e.g. hsqldb (b): jdbc:hsqldb:hsql://localhost:9001/grouper
# e.g. postgres: jdbc:postgresql://localhost:5432/database
# e.g. mssql: jdbc:sqlserver://localhost:3280;databaseName=grouper
hibernate.connection.url = jdbc:mysql://#MYSQL_HOST#:3306/#MYSQL_DATABASE#

hibernate.connection.username = #MYSQL_USER#
# If you are using an empty password, depending upon your version of
# Java and Ant you may need to specify a password of "".
# Note: you can keep passwords external and encrypted: https://bugs.internet2.edu/jira/browse/GRP-122
hibernate.connection.password = #MYSQL_PASSWORD#
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
@@ -0,0 +1,2 @@
# The presence of this file indicates this container is
# part of a Grouper appliance.
21 changes: 11 additions & 10 deletions docker-compose.yml
Expand Up @@ -5,19 +5,20 @@ services:
image: bigfleet/mariadb
container_name: mariadb
hostname: mariadb
networks:
- i2network
ports:
- "3306:3306"
cap_add:
- ALL
- NET_ADMIN
- SYS_ADMIN
networks:
- i2network
volumes:
- grouper_mysql:/var/lib/mysqlmounted
restart: always
env_file:
- conf/common.env
- conf/db.env
- conf/common.env
- conf/db.env

grouper:
image: my/grouper
Expand All @@ -33,17 +34,17 @@ services:
- NET_ADMIN
- SYS_ADMIN
volumes:
- ./logs:/opt/grouper/2.3.0/apache-tomcat-6.0.35/logs
- ./logs/apache-tomcat:/opt/grouper/2.3.0/apache-tomcat-6.0.35/logs
- ./logs/httpd:/etc/httpd/logs
env_file:
- conf/common.env
- conf/grouper.env
depends_on:
- mariadb
- conf/common.env
- conf/grouper.env
restart: always

networks:
i2network:
driver: bridge

volumes:
grouper_mysql:
driver: local
driver: local

0 comments on commit fc40cee

Please sign in to comment.