diff --git a/Workbench/configs-and-secrets/grouper/application/grouper-loader.properties b/Workbench/configs-and-secrets/grouper/application/grouper-loader.properties index 7d66bbd..90e1bf1 100755 --- a/Workbench/configs-and-secrets/grouper/application/grouper-loader.properties +++ b/Workbench/configs-and-secrets/grouper/application/grouper-loader.properties @@ -55,7 +55,7 @@ db.sis.driver = com.mysql.jdbc.Driver db.midPoint.driver = org.postgresql.Driver #db.midPoint.pass = ${java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD') } db.midPoint.pass = password -db.midPoint.url = jdbc:postgresql://comanage_midpoint_data:5432/grouper_to_midpoint?CharSet=utf8 +db.midPoint.url = jdbc:postgresql://grouper_data:5432/grouper_to_midpoint?CharSet=utf8 db.midPoint.user = grouper # provisioner midpoint diff --git a/Workbench/configs-and-secrets/grouper/application/grouper.hibernate.properties b/Workbench/configs-and-secrets/grouper/application/grouper.hibernate.properties index 8bbdef1..a334fda 100755 --- a/Workbench/configs-and-secrets/grouper/application/grouper.hibernate.properties +++ b/Workbench/configs-and-secrets/grouper/application/grouper.hibernate.properties @@ -28,4 +28,5 @@ hibernate.connection.username = grouper # Note: you can keep passwords external and encrypted: https://bugs.internet2.edu/jira/browse/GRP-122 # hibernate.connection.password.elConfig = ${java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD') } hibernate.connection.password = password +hibernate.c3p0.max_size = 200 diff --git a/Workbench/grouper_data/Dockerfile b/Workbench/grouper_data/Dockerfile index 0811c3d..08bedad 100644 --- a/Workbench/grouper_data/Dockerfile +++ b/Workbench/grouper_data/Dockerfile @@ -12,6 +12,7 @@ RUN yum install -y epel-release \ COPY container_files/conf/ /opt/grouper/grouperWebapp/WEB-INF/classes/ COPY container_files/bootstrap/ /tmp/ COPY container_files/sql/createSQLuser.sql / +COPY container_files/sql/createDBforMP.sql / #setup DB RUN chown -R postgres:postgres /var/lib/pgsql/ @@ -21,6 +22,7 @@ RUN sudo -u postgres initdb -D /var/lib/pgsql/data/ --username=postgres --pwfile #create grouper DB RUN sudo -u postgres pg_ctl start -D /var/lib/pgsql/data/ \ && psql -U postgres -f /createSQLuser.sql \ + && psql -U postgres -f /createDBforMP.sql \ && /opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh -registry -check -runscript -noprompt \ && /opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh /tmp/initialize.gsh \ && /opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh /tmp/set-prov.gsh diff --git a/Workbench/grouper_data/container_files/conf/grouper.hibernate.properties b/Workbench/grouper_data/container_files/conf/grouper.hibernate.properties index f7ef3b1..3c752a7 100644 --- a/Workbench/grouper_data/container_files/conf/grouper.hibernate.properties +++ b/Workbench/grouper_data/container_files/conf/grouper.hibernate.properties @@ -28,4 +28,5 @@ hibernate.connection.username = grouper # Note: you can keep passwords external and encrypted: https://bugs.internet2.edu/jira/browse/GRP-122 hibernate.connection.password = password registry.auto.ddl.upToVersion = 4.*.* +hibernate.c3p0.max_size = 200 diff --git a/Workbench/comanage_midpoint_data/container_files/seed-data/createDBforMP.sql b/Workbench/grouper_data/container_files/sql/createDBforMP.sql similarity index 98% rename from Workbench/comanage_midpoint_data/container_files/seed-data/createDBforMP.sql rename to Workbench/grouper_data/container_files/sql/createDBforMP.sql index b5c6541..b586d4a 100644 --- a/Workbench/comanage_midpoint_data/container_files/seed-data/createDBforMP.sql +++ b/Workbench/grouper_data/container_files/sql/createDBforMP.sql @@ -1,5 +1,4 @@ -CREATE DATABASE grouper_to_midpoint WITH ENCODING=utf8; -CREATE USER grouper WITH PASSWORD 'password'; +CREATE DATABASE grouper_to_midpoint; GRANT ALL PRIVILEGES ON DATABASE grouper_to_midpoint TO grouper; \connect grouper_to_midpoint; diff --git a/Workbench/grouper_data/container_files/sql/createSQLuser.sql b/Workbench/grouper_data/container_files/sql/createSQLuser.sql index 7827999..9e6bd40 100644 --- a/Workbench/grouper_data/container_files/sql/createSQLuser.sql +++ b/Workbench/grouper_data/container_files/sql/createSQLuser.sql @@ -1,3 +1,5 @@ +ALTER system SET max_connections=250; +ALTER system SET shared_buffers='180MB'; CREATE USER grouper PASSWORD 'password'; CREATE DATABASE grouper; GRANT ALL PRIVILEGES ON DATABASE grouper TO grouper; diff --git a/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-1.0-SNAPSHOT.jar b/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-1.0-SNAPSHOT.jar index dfdf852..dbe824e 100644 Binary files a/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-1.0-SNAPSHOT.jar and b/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-1.0-SNAPSHOT.jar differ diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper-new.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper-new.xml index dc71278..8b2a78d 100644 --- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper-new.xml +++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper-new.xml @@ -47,7 +47,7 @@ - comanage_midpoint_data + grouper_data 5432 grouper password