From 48bf3f53b5255707ee9b998beafcf76bea062b1a Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 31 Oct 2017 10:52:48 -0400 Subject: [PATCH 1/9] Update README.md --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 8b13789..9864d3f 100644 --- a/README.md +++ b/README.md @@ -1 +1,20 @@ +Components that run in their own container: +Loader +UI +WS +Database/LDAP +Web Server + + +The following files should be modified to your environment: +./test-compose/www/container_files/httpd/localhost.crt (web server SSL cert) +./test-compose/www/container_files/httpd/localhost.key (private key for the web server) +./test-compose/www/container_files/shibboleth/shibboleth2.xml (Configuration file for Shibboleth) +./test-compose/www/container_files/shibboleth/sp-cert.pem (Certificate for Shibboleth SP) +./test-compose/www/container_files/shibboleth/sp-key.pem (Key for Shibboleth SP) +./test-compose/data/seed-data/bootstrap.gsh (Modify line that starts with addMember to reflect ePPN/remote_user for administrator) + +./test-compose/data/seed-data/ds-setup.inf +./test-compose/data/seed-data/users.ldif +./test-compose/data/seed-data/sisData.sql From a12b738a8620957f36cb015eff8a8d7fe30f8259 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 31 Oct 2017 10:57:23 -0400 Subject: [PATCH 2/9] Update README.md --- README.md | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9864d3f..cfdd754 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,30 @@ Components that run in their own container: -Loader -UI -WS -Database/LDAP -Web Server +* Loader +* UI +* WS +* Database/LDAP +* Web Server The following files should be modified to your environment: + ./test-compose/www/container_files/httpd/localhost.crt (web server SSL cert) + ./test-compose/www/container_files/httpd/localhost.key (private key for the web server) + ./test-compose/www/container_files/shibboleth/shibboleth2.xml (Configuration file for Shibboleth) + ./test-compose/www/container_files/shibboleth/sp-cert.pem (Certificate for Shibboleth SP) + ./test-compose/www/container_files/shibboleth/sp-key.pem (Key for Shibboleth SP) + ./test-compose/data/seed-data/bootstrap.gsh (Modify line that starts with addMember to reflect ePPN/remote_user for administrator) + ./test-compose/data/seed-data/ds-setup.inf + ./test-compose/data/seed-data/users.ldif + ./test-compose/data/seed-data/sisData.sql + From cb9ef4fd5339aee8d79e58d47368950b50996417 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 31 Oct 2017 11:25:04 -0400 Subject: [PATCH 3/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cfdd754..dda2abf 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Components that run in their own container: * Web Server -The following files should be modified to your environment: +*The following files should be modified to your environment:* ./test-compose/www/container_files/httpd/localhost.crt (web server SSL cert) From cba1391a547aaab3f449fc6bc81e3441ac6f813c Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 31 Oct 2017 11:25:23 -0400 Subject: [PATCH 4/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dda2abf..fccaad0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Components that run in their own container: * Web Server -*The following files should be modified to your environment:* +"The following files should be modified to your environment:" ./test-compose/www/container_files/httpd/localhost.crt (web server SSL cert) From 115c5f628b23775dc91022458bc115541c4120da Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 6 Nov 2017 12:04:20 -0500 Subject: [PATCH 5/9] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fccaad0..fbc626f 100644 --- a/README.md +++ b/README.md @@ -7,19 +7,19 @@ Components that run in their own container: * Web Server -"The following files should be modified to your environment:" +### The following files should be modified to your environment: -./test-compose/www/container_files/httpd/localhost.crt (web server SSL cert) +./test-compose/www/container_files/httpd/localhost.crt **(web server SSL cert)** -./test-compose/www/container_files/httpd/localhost.key (private key for the web server) +./test-compose/www/container_files/httpd/localhost.key **(private key for the web server)** -./test-compose/www/container_files/shibboleth/shibboleth2.xml (Configuration file for Shibboleth) +./test-compose/www/container_files/shibboleth/shibboleth2.xml **(Configuration file for Shibboleth) -./test-compose/www/container_files/shibboleth/sp-cert.pem (Certificate for Shibboleth SP) +./test-compose/www/container_files/shibboleth/sp-cert.pem **(Certificate for Shibboleth SP)** -./test-compose/www/container_files/shibboleth/sp-key.pem (Key for Shibboleth SP) +./test-compose/www/container_files/shibboleth/sp-key.pem **(Key for Shibboleth SP)** -./test-compose/data/seed-data/bootstrap.gsh (Modify line that starts with addMember to reflect ePPN/remote_user for administrator) +./test-compose/data/seed-data/bootstrap.gsh **(Modify line that starts with addMember to reflect ePPN/remote_user for administrator)** ./test-compose/data/seed-data/ds-setup.inf From 7a75d684cff64ea6bfbe7ae2858f7fdc9182f97a Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 6 Nov 2017 12:08:54 -0500 Subject: [PATCH 6/9] Update README.md --- README.md | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index fbc626f..04227bd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +This repository contains code that will build and run Grouper in a Docker environment. Components that run in their own container: * Loader @@ -7,24 +8,16 @@ Components that run in their own container: * Web Server -### The following files should be modified to your environment: - -./test-compose/www/container_files/httpd/localhost.crt **(web server SSL cert)** - -./test-compose/www/container_files/httpd/localhost.key **(private key for the web server)** - -./test-compose/www/container_files/shibboleth/shibboleth2.xml **(Configuration file for Shibboleth) - -./test-compose/www/container_files/shibboleth/sp-cert.pem **(Certificate for Shibboleth SP)** -./test-compose/www/container_files/shibboleth/sp-key.pem **(Key for Shibboleth SP)** - -./test-compose/data/seed-data/bootstrap.gsh **(Modify line that starts with addMember to reflect ePPN/remote_user for administrator)** - - -./test-compose/data/seed-data/ds-setup.inf - -./test-compose/data/seed-data/users.ldif +### The following files should be modified to your environment: -./test-compose/data/seed-data/sisData.sql +| ./test-compose/www/container_files/httpd/localhost.crt | **(web server SSL cert)** | +| ./test-compose/www/container_files/httpd/localhost.key | **(private key for the web server)** | +| ./test-compose/www/container_files/shibboleth/shibboleth2.xml | **(Configuration file for Shibboleth) | +| ./test-compose/www/container_files/shibboleth/sp-cert.pem | **(Certificate for Shibboleth SP)** | +| ./test-compose/www/container_files/shibboleth/sp-key.pem | **(Key for Shibboleth SP)** | +| ./test-compose/data/seed-data/bootstrap.gsh | **(Modify line that starts with addMember to reflect ePPN/remote_user for administrator)** | +| ./test-compose/data/seed-data/ds-setup.inf | | +| ./test-compose/data/seed-data/users.ldif | | +| ./test-compose/data/seed-data/sisData.sql | | From 55380bd0777b1224c06bc40ab2e0f0d00265f0fa Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 6 Nov 2017 12:10:56 -0500 Subject: [PATCH 7/9] Update README.md --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 04227bd..daedf6a 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,14 @@ Components that run in their own container: ### The following files should be modified to your environment: -| ./test-compose/www/container_files/httpd/localhost.crt | **(web server SSL cert)** | -| ./test-compose/www/container_files/httpd/localhost.key | **(private key for the web server)** | -| ./test-compose/www/container_files/shibboleth/shibboleth2.xml | **(Configuration file for Shibboleth) | -| ./test-compose/www/container_files/shibboleth/sp-cert.pem | **(Certificate for Shibboleth SP)** | -| ./test-compose/www/container_files/shibboleth/sp-key.pem | **(Key for Shibboleth SP)** | -| ./test-compose/data/seed-data/bootstrap.gsh | **(Modify line that starts with addMember to reflect ePPN/remote_user for administrator)** | +| File | Purpose | +| ------------- |:-------------:| +| ./test-compose/www/container_files/httpd/localhost.crt | web server SSL cert | +| ./test-compose/www/container_files/httpd/localhost.key | private key for the web server | +| ./test-compose/www/container_files/shibboleth/shibboleth2.xml | Configuration file for Shibboleth | +| ./test-compose/www/container_files/shibboleth/sp-cert.pem | Certificate for Shibboleth SP | +| ./test-compose/www/container_files/shibboleth/sp-key.pem | Key for Shibboleth SP | +| ./test-compose/data/seed-data/bootstrap.gsh | Modify line that starts with addMember to reflect ePPN/remote_user for administrator | | ./test-compose/data/seed-data/ds-setup.inf | | | ./test-compose/data/seed-data/users.ldif | | | ./test-compose/data/seed-data/sisData.sql | | From 17f7104dc53df8f1781e6eed30aeb1bfcb250da2 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 6 Nov 2017 12:12:38 -0500 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index daedf6a..8cbb118 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Components that run in their own container: | ./test-compose/www/container_files/shibboleth/sp-cert.pem | Certificate for Shibboleth SP | | ./test-compose/www/container_files/shibboleth/sp-key.pem | Key for Shibboleth SP | | ./test-compose/data/seed-data/bootstrap.gsh | Modify line that starts with addMember to reflect ePPN/remote_user for administrator | -| ./test-compose/data/seed-data/ds-setup.inf | | +| ./test-compose/data/seed-data/ds-setup.inf | Modify LDAP password and Suffix | | ./test-compose/data/seed-data/users.ldif | | | ./test-compose/data/seed-data/sisData.sql | | From c794f997343895bd00c429a3b548bdda611d4183 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 6 Nov 2017 14:01:16 -0500 Subject: [PATCH 9/9] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8cbb118..2e4ee62 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -This repository contains code that will build and run Grouper in a Docker environment. +This repository contains code that will build and run Grouper 2.3 in a Docker environment. To build the base containers, run ./manualbuild.sh. After that completes, configure files under the test-compose directory to your environment (listed below). Components that run in their own container: * Loader * UI * WS * Database/LDAP -* Web Server +* Web Server (with Shibboleth) @@ -20,6 +20,6 @@ Components that run in their own container: | ./test-compose/www/container_files/shibboleth/sp-key.pem | Key for Shibboleth SP | | ./test-compose/data/seed-data/bootstrap.gsh | Modify line that starts with addMember to reflect ePPN/remote_user for administrator | | ./test-compose/data/seed-data/ds-setup.inf | Modify LDAP password and Suffix | -| ./test-compose/data/seed-data/users.ldif | | -| ./test-compose/data/seed-data/sisData.sql | | +| ./test-compose/data/seed-data/users.ldif | Initial user load, if using the built in LDAP server, ensure the administrator user listed in bootstrap.sh exists in this directory | +| ./test-compose/data/seed-data/sisData.sql | Loads test data into database |