You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/09/28 20:58:36 UTC
[trafficcontrol] branch master updated: add missing copyright
headers
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new caeb4e4 add missing copyright headers
caeb4e4 is described below
commit caeb4e4a2aa52df276718a4cb38dcceb4fc6d189
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Thu Sep 27 22:15:33 2018 -0400
add missing copyright headers
---
docs/source/development/ort/modules.rst | 15 +++++++++++++++
docs/source/development/ort/traffic_ops_ort.rst | 15 +++++++++++++++
infrastructure/cdn-in-a-box/cache/crontab | 16 ++++++++++++++++
infrastructure/cdn-in-a-box/edge/run.sh | 5 +++++
infrastructure/cdn-in-a-box/testclient/README.md | 19 +++++++++++++++++++
infrastructure/cdn-in-a-box/testclient/run.sh | 16 ++++++++++++++++
infrastructure/cdn-in-a-box/testclient/vnc_startup.sh | 16 ++++++++++++++++
.../cdn-in-a-box/traffic_ops/generate-certs.sh | 16 ++++++++++++++++
.../parameters/{010-global => 010-global.json} | 0
.../traffic_vault/poststart.d/00-enable-security.sh | 16 ++++++++++++++++
.../traffic_vault/poststart.d/01-add-search-group.sh | 16 ++++++++++++++++
.../traffic_vault/poststart.d/02-add-search-schema.sh | 16 ++++++++++++++++
.../traffic_vault/prestart.d/00-config.sh | 16 ++++++++++++++++
13 files changed, 182 insertions(+)
diff --git a/docs/source/development/ort/modules.rst b/docs/source/development/ort/modules.rst
index 80aec80..c978811 100644
--- a/docs/source/development/ort/modules.rst
+++ b/docs/source/development/ort/modules.rst
@@ -1,3 +1,18 @@
+..
+..
+.. 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.
+..
+
edge
====
diff --git a/docs/source/development/ort/traffic_ops_ort.rst b/docs/source/development/ort/traffic_ops_ort.rst
index ac0780b..c7bcae5 100644
--- a/docs/source/development/ort/traffic_ops_ort.rst
+++ b/docs/source/development/ort/traffic_ops_ort.rst
@@ -1,3 +1,18 @@
+..
+..
+.. 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.
+..
+
traffic\_ops\_ort module
========================
diff --git a/infrastructure/cdn-in-a-box/cache/crontab b/infrastructure/cdn-in-a-box/cache/crontab
index 25eedbc..e2690f5 100644
--- a/infrastructure/cdn-in-a-box/cache/crontab
+++ b/infrastructure/cdn-in-a-box/cache/crontab
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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.
*/1 * * * * /opt/ort/traffic_ops_ort.py SYNCDS ALL https://$TO_FQDN $TO_ADMIN_USER:$TO_ADMIN_PASSWORD >> /var/log/ort.log 2>> /var/log/ort.log
diff --git a/infrastructure/cdn-in-a-box/edge/run.sh b/infrastructure/cdn-in-a-box/edge/run.sh
index cc1a2db..d84e6d6 100755
--- a/infrastructure/cdn-in-a-box/edge/run.sh
+++ b/infrastructure/cdn-in-a-box/edge/run.sh
@@ -76,5 +76,10 @@ crontab "/var/spool/cron/root"
crond -im off
+until grep -q demo1 /etc/trafficserver/remap.config; do
+ sleep 3
+done
+crontab -r
+
touch /var/log/trafficserver/diags.log
tail -F /var/log/trafficserver/diags.log
diff --git a/infrastructure/cdn-in-a-box/testclient/README.md b/infrastructure/cdn-in-a-box/testclient/README.md
index 22df537..421a38e 100644
--- a/infrastructure/cdn-in-a-box/testclient/README.md
+++ b/infrastructure/cdn-in-a-box/testclient/README.md
@@ -1,3 +1,22 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF 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.
+-->
+
# Private VNC/proxy testclient for ApacheConf Demo
## To start/install the VNC/proxy container
diff --git a/infrastructure/cdn-in-a-box/testclient/run.sh b/infrastructure/cdn-in-a-box/testclient/run.sh
index 1a64a8e..aad0428 100755
--- a/infrastructure/cdn-in-a-box/testclient/run.sh
+++ b/infrastructure/cdn-in-a-box/testclient/run.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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.
################################################################################
# Wait on SSL certificate generation
diff --git a/infrastructure/cdn-in-a-box/testclient/vnc_startup.sh b/infrastructure/cdn-in-a-box/testclient/vnc_startup.sh
index 86be3f1..af79fd7 100755
--- a/infrastructure/cdn-in-a-box/testclient/vnc_startup.sh
+++ b/infrastructure/cdn-in-a-box/testclient/vnc_startup.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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.
VNC_DEPTH=${VNC_DEPTH:-32}
VNC_RESOLUTION=${VNC_DEPTH:-1440x900}
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/generate-certs.sh b/infrastructure/cdn-in-a-box/traffic_ops/generate-certs.sh
index c834d9b..8f6600f 100755
--- a/infrastructure/cdn-in-a-box/traffic_ops/generate-certs.sh
+++ b/infrastructure/cdn-in-a-box/traffic_ops/generate-certs.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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.
X509_CA_DEFAULT_NAME="ca"
X509_CA_DEFAULT_COUNTRY="ZZ"
diff --git a/infrastructure/cdn-in-a-box/traffic_ops_data/parameters/010-global b/infrastructure/cdn-in-a-box/traffic_ops_data/parameters/010-global.json
similarity index 100%
rename from infrastructure/cdn-in-a-box/traffic_ops_data/parameters/010-global
rename to infrastructure/cdn-in-a-box/traffic_ops_data/parameters/010-global.json
diff --git a/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/00-enable-security.sh b/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/00-enable-security.sh
index 7a5ac80..c49a3ab 100644
--- a/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/00-enable-security.sh
+++ b/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/00-enable-security.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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.
set -x
# Enable Security
diff --git a/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/01-add-search-group.sh b/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/01-add-search-group.sh
index ea75758..6a5927b 100644
--- a/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/01-add-search-group.sh
+++ b/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/01-add-search-group.sh
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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.
source /to-access.sh
$RIAK_ADMIN security grant search.admin on schema to admin
diff --git a/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/02-add-search-schema.sh b/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/02-add-search-schema.sh
index d4aa386..512f479 100644
--- a/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/02-add-search-schema.sh
+++ b/infrastructure/cdn-in-a-box/traffic_vault/poststart.d/02-add-search-schema.sh
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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.
source /to-access.sh
curl -kvs -XPUT -H 'Content-Type:application/xml' "https://$TV_ADMIN_USER:$TV_ADMIN_PASSWORD@$TV_FQDN:$TV_HTTPS_PORT/search/schema/sslkeys" -d @/sslkeys.xml
diff --git a/infrastructure/cdn-in-a-box/traffic_vault/prestart.d/00-config.sh b/infrastructure/cdn-in-a-box/traffic_vault/prestart.d/00-config.sh
index 3dbf11d..980e391 100644
--- a/infrastructure/cdn-in-a-box/traffic_vault/prestart.d/00-config.sh
+++ b/infrastructure/cdn-in-a-box/traffic_vault/prestart.d/00-config.sh
@@ -1,4 +1,20 @@
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF 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.
# Update system shared CA support
source /to-access.sh