From 378b7bda061b15e3b3cbaf8627c8a96a148fe59d Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 10:31:41 -0300 Subject: [PATCH] Added legal comment --- BINSCRIPTS.md | 15 +++++++++++++++ Dockerfile | 15 +++++++++++++++ bin/ci-run.sh | 15 +++++++++++++++ bin/ci-stop.sh | 15 +++++++++++++++ common.bash | 17 ++++++++++++++++- container_files/bin/httpd-shib-foreground | 16 ++++++++++++++++ container_files/bin/shibboleth_keygen.sh | 17 ++++++++++++++++- container_files/etc/httpd/conf.d/ssl.conf | 15 +++++++++++++++ .../etc/httpd/conf.modules.d/00-shib.conf | 16 ++++++++++++++++ .../etc/shibboleth/attribute-map.xml | 16 ++++++++++++++++ 10 files changed, 155 insertions(+), 2 deletions(-) mode change 100755 => 100644 bin/ci-run.sh mode change 100755 => 100644 bin/ci-stop.sh mode change 100755 => 100644 container_files/bin/httpd-shib-foreground mode change 100755 => 100644 container_files/bin/shibboleth_keygen.sh diff --git a/BINSCRIPTS.md b/BINSCRIPTS.md index f5949ba..fab86d4 100644 --- a/BINSCRIPTS.md +++ b/BINSCRIPTS.md @@ -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. +# # util This repository is intended to be downloaded into a container repository during development for convenience purposes. Since the major mechanisms of developing to the Docker container construction lifecycle are identical across container images, this repository allows for consistency and additional ease of use across all container images. diff --git a/Dockerfile b/Dockerfile index f7423ce..5426989 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 tier/centos7base # Define args and set a default value diff --git a/bin/ci-run.sh b/bin/ci-run.sh old mode 100755 new mode 100644 index 70761f0..2e85f54 --- a/bin/ci-run.sh +++ b/bin/ci-run.sh @@ -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. +# #!/bin/bash # This file will run a container in the background diff --git a/bin/ci-stop.sh b/bin/ci-stop.sh old mode 100755 new mode 100644 index 54ab019..bf94613 --- a/bin/ci-stop.sh +++ b/bin/ci-stop.sh @@ -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. +# #!/bin/bash # This file will run a container in the background diff --git a/common.bash b/common.bash index 362ce33..113f05d 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="tier" imagename="shibboleth_sp" -version="2.5.1" \ No newline at end of file +version="2.5.1" diff --git a/container_files/bin/httpd-shib-foreground b/container_files/bin/httpd-shib-foreground old mode 100755 new mode 100644 index 60a415f..74bcb26 --- a/container_files/bin/httpd-shib-foreground +++ b/container_files/bin/httpd-shib-foreground @@ -1,3 +1,19 @@ +# +# 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. +# #!/bin/sh set -e diff --git a/container_files/bin/shibboleth_keygen.sh b/container_files/bin/shibboleth_keygen.sh old mode 100755 new mode 100644 index 205792e..20bad15 --- a/container_files/bin/shibboleth_keygen.sh +++ b/container_files/bin/shibboleth_keygen.sh @@ -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. +# #! /bin/sh while getopts h:u:g:o:e:y:bf c @@ -72,4 +87,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 diff --git a/container_files/etc/httpd/conf.d/ssl.conf b/container_files/etc/httpd/conf.d/ssl.conf index ccc067c..03fd3fe 100644 --- a/container_files/etc/httpd/conf.d/ssl.conf +++ b/container_files/etc/httpd/conf.d/ssl.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. +# SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog SSLSessionCache shmcb:/run/httpd/sslcache(512000) SSLSessionCacheTimeout 300 diff --git a/container_files/etc/httpd/conf.modules.d/00-shib.conf b/container_files/etc/httpd/conf.modules.d/00-shib.conf index 0e5c7b2..037aca6 100644 --- a/container_files/etc/httpd/conf.modules.d/00-shib.conf +++ b/container_files/etc/httpd/conf.modules.d/00-shib.conf @@ -1 +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. +# LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_24.so diff --git a/container_files/etc/shibboleth/attribute-map.xml b/container_files/etc/shibboleth/attribute-map.xml index 12c4019..8f7735d 100644 --- a/container_files/etc/shibboleth/attribute-map.xml +++ b/container_files/etc/shibboleth/attribute-map.xml @@ -1,3 +1,19 @@ +