From af840708bd3a757d5fb66d76a227e337d7a6bc9b Mon Sep 17 00:00:00 2001 From: villadalmine Date: Thu, 15 Sep 2016 16:15:38 -0300 Subject: [PATCH 01/21] Added notice and license --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ NOTICE | 5 ++ 2 files changed, 207 insertions(+) create mode 100644 LICENSE create mode 100644 NOTICE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..240853c --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache [PRODUCT_NAME] +Copyright [XXXX-XXXX] The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). From b4a9896f3dbaf48feffc83cc5d817bbaebdc1946 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:15:16 -0300 Subject: [PATCH 02/21] Update common.bash --- common.bash | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/common.bash b/common.bash index 79fd23f..83278ce 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# maintainer="bigfleet" imagename="comanage" -version="1.0.5" \ No newline at end of file +version="1.0.5" From 60538a66ec3e508837df53acf0fd8717d972657e Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:16:06 -0300 Subject: [PATCH 03/21] Update Dockerfile --- Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1b81d59..b264e4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# FROM bigfleet/shibboleth_sp # Define args and set a default value From 5a131b361d47b07f55004992e6b12054bfbb88ca Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:16:49 -0300 Subject: [PATCH 04/21] Update README.md --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 07289f2..bb883d1 100644 --- a/README.md +++ b/README.md @@ -1 +1,16 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# # COManage From fc08c95b25a7e7fa600e05799f29d2fc9a0b4a6c Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:19:50 -0300 Subject: [PATCH 05/21] Update Jenkinsfile --- Jenkinsfile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9f6a1c0..80b51fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,18 @@ +// Licensed to the University Corporation for Advanced Internet Development, +// Inc. (UCAID) under one or more contributor license agreements. See the +// NOTICE file distributed with this work for additional information regarding +// copyright ownership. The UCAID licenses this file to You 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. +// node('docker') { stage 'Checkout' @@ -85,4 +100,4 @@ def handleError(String message){ slackSend color: 'danger', message: "${message}" //step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'chris.bynum@levvel.io', sendToIndividuals: true]) sh 'exit 1' -} \ No newline at end of file +} From a9b2c48b635753d7bf2ccef5434f066c6f7d2fc1 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:20:37 -0300 Subject: [PATCH 06/21] Update image.bats --- tests/image.bats | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/image.bats b/tests/image.bats index e14978f..c422091 100644 --- a/tests/image.bats +++ b/tests/image.bats @@ -1,7 +1,21 @@ #!/usr/bin/env bats - +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# load ../common @test "COmanage directory created" { docker run -i $maintainer/$imagename find /opt/comanage/comanage-registry-$version -} \ No newline at end of file +} From 2de4293494095ae9115d73f2e1bc2a33f5a9b53f Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:21:10 -0300 Subject: [PATCH 07/21] Update cleanup.sh --- container_files/bin/cleanup.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/container_files/bin/cleanup.sh b/container_files/bin/cleanup.sh index 183ddb4..7fd2a8a 100755 --- a/container_files/bin/cleanup.sh +++ b/container_files/bin/cleanup.sh @@ -1,5 +1,19 @@ #!/bin/bash - +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# log=/tmp/cleanup.log date >> $log From 799d0fede165e66c75cd7f710d9e3c870b44f87a Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:22:03 -0300 Subject: [PATCH 08/21] Update configure.sh --- container_files/bin/configure.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh index 1192411..964ac15 100755 --- a/container_files/bin/configure.sh +++ b/container_files/bin/configure.sh @@ -1,5 +1,19 @@ #!/bin/bash - +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# /opt/bin/configure_httpd.sh /opt/bin/configure_shibd.sh From bf2fc6c1bea650f1fadf5ba43121e4c23c2550b0 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:22:14 -0300 Subject: [PATCH 09/21] Update configure_httpd.sh --- container_files/bin/configure_httpd.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/container_files/bin/configure_httpd.sh b/container_files/bin/configure_httpd.sh index 3f025b7..b3d5850 100755 --- a/container_files/bin/configure_httpd.sh +++ b/container_files/bin/configure_httpd.sh @@ -1,5 +1,19 @@ #!/bin/bash - +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# log="/tmp/httpd.log" date >> $log echo "Configuring httpd: " >> $log From 538f9c82ec4f1958e9da801bb82021741900ea55 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:22:26 -0300 Subject: [PATCH 10/21] Update configure_php.sh --- container_files/bin/configure_php.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/container_files/bin/configure_php.sh b/container_files/bin/configure_php.sh index 874a785..982e96b 100755 --- a/container_files/bin/configure_php.sh +++ b/container_files/bin/configure_php.sh @@ -1,5 +1,19 @@ #!/bin/bash - +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# log="/tmp/php.log" date >> $log echo "Configuring php: " >> $log From 98f8a82d66f59226c23133c52f2562e8389e6659 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:22:59 -0300 Subject: [PATCH 11/21] Update configure_php_user.sh --- container_files/bin/configure_php_user.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/container_files/bin/configure_php_user.sh b/container_files/bin/configure_php_user.sh index b92f170..9ee7730 100755 --- a/container_files/bin/configure_php_user.sh +++ b/container_files/bin/configure_php_user.sh @@ -1,3 +1,19 @@ +#!/bin/bash +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# log=/tmp/php-user.sh date >> $log From a2fcc01e365fd74e84f3b0a12c2a5c2d56b2e4e6 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:23:13 -0300 Subject: [PATCH 12/21] Update configure_shibd.sh --- container_files/bin/configure_shibd.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/container_files/bin/configure_shibd.sh b/container_files/bin/configure_shibd.sh index a76961f..eaed84f 100755 --- a/container_files/bin/configure_shibd.sh +++ b/container_files/bin/configure_shibd.sh @@ -1,5 +1,19 @@ #!/bin/bash - +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# log="/tmp/shibd.log" date >> $log echo "Configuring shibd: " > $log From 4a751869810f392ec261ca14a0214338d4e064f1 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:23:25 -0300 Subject: [PATCH 13/21] Update main.sh --- container_files/bin/main.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/container_files/bin/main.sh b/container_files/bin/main.sh index 1f49896..80a811d 100755 --- a/container_files/bin/main.sh +++ b/container_files/bin/main.sh @@ -1,5 +1,19 @@ #!/bin/bash -x - +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# log="/tmp/start-main.log" echo "Starting Container: " > $log @@ -17,4 +31,4 @@ if [ -e "/tmp/firsttimerunning" ]; then else echo "COmanage container has run." >> $log echo "If there are problems, docker rm this container and try again." >> $log -fi \ No newline at end of file +fi From 2a87c0a753940845d6f153b1759792982ed89ccc Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:23:38 -0300 Subject: [PATCH 14/21] Update start.sh --- container_files/bin/start.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index e505c85..d18a07c 100755 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -1,4 +1,19 @@ #!/bin/bash +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# log="/tmp/start-starting.log" date >> $log From 836ec2b0e04b26b80888d3ccfe9431f3b95e97ca Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:23:55 -0300 Subject: [PATCH 15/21] Update handlers.conf --- container_files/etc/httpd/conf.d/handlers.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/container_files/etc/httpd/conf.d/handlers.conf b/container_files/etc/httpd/conf.d/handlers.conf index e094143..05d54f4 100644 --- a/container_files/etc/httpd/conf.d/handlers.conf +++ b/container_files/etc/httpd/conf.d/handlers.conf @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# AddType text/html .php php_value session.save_handler "files" php_value session.save_path "/var/lib/php/session" From 82eaf6ce00db1ec7de717cc45226c8456da5b2f2 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:24:08 -0300 Subject: [PATCH 16/21] Update ports.conf --- container_files/etc/httpd/conf.d/ports.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/container_files/etc/httpd/conf.d/ports.conf b/container_files/etc/httpd/conf.d/ports.conf index cf2b7d0..c7e9070 100644 --- a/container_files/etc/httpd/conf.d/ports.conf +++ b/container_files/etc/httpd/conf.d/ports.conf @@ -1,2 +1,17 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# Listen 80 http Listen 443 https From 641ba2fcef405df1bbbe30f990ca425a9a84b4f2 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:24:20 -0300 Subject: [PATCH 17/21] Update virtual_host_443.conf --- .../etc/httpd/conf.d/virtual_host_443.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/container_files/etc/httpd/conf.d/virtual_host_443.conf b/container_files/etc/httpd/conf.d/virtual_host_443.conf index 28d17ea..528739c 100644 --- a/container_files/etc/httpd/conf.d/virtual_host_443.conf +++ b/container_files/etc/httpd/conf.d/virtual_host_443.conf @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# ServerName https://COMANAGE_SERVER_FQDN:443 UseCanonicalName On From a999ecc4f588ea743d87f491154dc695bd6b546a Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:24:30 -0300 Subject: [PATCH 18/21] Update virtual_host_80.conf --- .../etc/httpd/conf.d/virtual_host_80.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/container_files/etc/httpd/conf.d/virtual_host_80.conf b/container_files/etc/httpd/conf.d/virtual_host_80.conf index ffe62ec..4e29838 100644 --- a/container_files/etc/httpd/conf.d/virtual_host_80.conf +++ b/container_files/etc/httpd/conf.d/virtual_host_80.conf @@ -1,3 +1,18 @@ +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# ServerName http://COMANAGE_SERVER_FQDN:80 UseCanonicalName On From c0b5269f746b0f26df457f031f09f37a2aac6916 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:28:02 -0300 Subject: [PATCH 19/21] Update attribute-map.xml --- .../etc/shibboleth/attribute-map.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/container_files/etc/shibboleth/attribute-map.xml b/container_files/etc/shibboleth/attribute-map.xml index 12c4019..ea6fb45 100644 --- a/container_files/etc/shibboleth/attribute-map.xml +++ b/container_files/etc/shibboleth/attribute-map.xml @@ -1,3 +1,20 @@ + + From f96744b45a6c74cce89e1d552712fb471b003d9d Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 12:28:26 -0300 Subject: [PATCH 20/21] Update shibboleth2.xml --- container_files/etc/shibboleth/shibboleth2.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/container_files/etc/shibboleth/shibboleth2.xml b/container_files/etc/shibboleth/shibboleth2.xml index 3dd9a9b..7508e90 100644 --- a/container_files/etc/shibboleth/shibboleth2.xml +++ b/container_files/etc/shibboleth/shibboleth2.xml @@ -1,3 +1,19 @@ + Date: Fri, 16 Sep 2016 12:28:55 -0300 Subject: [PATCH 21/21] Update shibboleth_keygen.sh --- .../etc/shibboleth/shibboleth_keygen.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/container_files/etc/shibboleth/shibboleth_keygen.sh b/container_files/etc/shibboleth/shibboleth_keygen.sh index 205792e..bccf866 100755 --- a/container_files/etc/shibboleth/shibboleth_keygen.sh +++ b/container_files/etc/shibboleth/shibboleth_keygen.sh @@ -1,5 +1,19 @@ #! /bin/sh - +# Licensed to the University Corporation for Advanced Internet Development, +# Inc. (UCAID) under one or more contributor license agreements. See the +# NOTICE file distributed with this work for additional information regarding +# copyright ownership. The UCAID licenses this file to You 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. +# while getopts h:u:g:o:e:y:bf c do case $c in @@ -72,4 +86,4 @@ if [ -z "$BATCH" ] ; then else openssl req -config $SSLCNF -new -x509 -days $DAYS -keyout $OUT/sp-key.pem -out $OUT/sp-cert.pem 2> /dev/null fi -rm $SSLCNF \ No newline at end of file +rm $SSLCNF