Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'grouperappFix' into resolve-conflict
- Loading branch information
Showing
9 changed files
with
99 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,3 +8,4 @@ bin/start.sh | |
bin/stop.sh | ||
bin/test.sh | ||
mysql | ||
logs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
COMPOSE=true | ||
MYSQL_DATABASE=grouper | ||
MYSQL_USER=grouper_user | ||
MYSQL_PASSWORD=3cf0ccc7d6b240390188367933c9cd90 | ||
MYSQL_PASSWORD=3cf0ccc7d6b240390188367933c9cd90 | ||
COMPOSE=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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# |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters