You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/09/25 21:07:46 UTC
[5/6] git commit: Adding license headers and licensing details for
patches folder.
Adding license headers and licensing details for patches folder.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e2730c91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e2730c91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e2730c91
Branch: refs/heads/junit-tests
Commit: e2730c91d9b31875fa101688815deeff0f3506b5
Parents: f20bee3
Author: Chip Childers <ch...@gmail.com>
Authored: Tue Sep 25 14:26:30 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Tue Sep 25 14:26:52 2012 -0400
----------------------------------------------------------------------
.../config/root/redundant_router/backup.sh.templ | 16 +++++++++
.../root/redundant_router/check_heartbeat.sh.templ | 17 +++++++++
.../root/redundant_router/checkrouter.sh.templ | 17 +++++++++
.../root/redundant_router/enable_pubip.sh.templ | 16 +++++++++
.../config/root/redundant_router/fault.sh.templ | 16 +++++++++
.../root/redundant_router/heartbeat.sh.templ | 16 +++++++++
.../config/root/redundant_router/master.sh.templ | 16 +++++++++
tools/whisker/descriptor.xml | 26 +++++++++++++++
8 files changed, 140 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2730c91/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ b/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ
index 8378f64..03111b5 100644
--- a/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ
+++ b/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ
@@ -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.
source /root/func.sh
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2730c91/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ b/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ
index 2695465..908c0d8 100755
--- a/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ
+++ b/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ
@@ -1,4 +1,21 @@
#!/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.
+
if [ -e [RROUTER_BIN_PATH]/keepalived.ts2 ]
then
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2730c91/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ b/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ
index ae22ec7..fbf4f0f 100755
--- a/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ
+++ b/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ
@@ -1,4 +1,21 @@
#!/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.
+
source /root/func.sh
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2730c91/patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ b/patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ
index 3260495..0bb6ef0 100644
--- a/patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ
+++ b/patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ
@@ -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 -e
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2730c91/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ b/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ
index 2305fb2..aecb08d 100644
--- a/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ
+++ b/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ
@@ -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.
source /root/func.sh
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2730c91/patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ b/patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ
index 90d790b..e064c1a 100755
--- a/patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ
+++ b/patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ
@@ -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.
t=$(date +%s)
echo $t > [RROUTER_BIN_PATH]/keepalived.ts
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2730c91/patches/systemvm/debian/config/root/redundant_router/master.sh.templ
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/redundant_router/master.sh.templ b/patches/systemvm/debian/config/root/redundant_router/master.sh.templ
index c8d0637..418fd5d 100644
--- a/patches/systemvm/debian/config/root/redundant_router/master.sh.templ
+++ b/patches/systemvm/debian/config/root/redundant_router/master.sh.templ
@@ -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.
source /root/func.sh
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2730c91/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 70474fe..0decf74 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2415,6 +2415,10 @@ this distribution.
id='caringo.com'
name='Caringo, Inc.'
url='http://www.caringo.com/' />
+ <organisation
+ id='person:simon.kelley'
+ name='Simon Kelley'
+ url='' />
</organisations>
<primary-license id='ApacheLicenseVersion2'>
<copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice>
@@ -2434,6 +2438,28 @@ Copyright © 2005-2010 Thomas Nagy
</by-organisation>
</with-license>
</within>
+ <within dir='patches/systemvm/debian/config/etc/apache2'>
+ <with-license id='ApacheLicenseVersion2'>
+ <copyright-notice>
+Copyright © 2012 The Apache Software Foundation
+ </copyright-notice>
+ <by-organisation id='apache.org'>
+ <resource name='httpd.conf' />
+ <resource name='ports.conf' />
+ <resource name='vhostexample.conf' />
+ <resource name='sites-available/default' />
+ <resource name='sites-available/default-ssl' />
+ </by-organisation>
+ </with-license>
+ </within>
+ <within dir='patches/systemvm/debian/config/etc'>
+ <public-domain>
+ <by-organisation id='person:simon.kelly'>
+ <resource name='vpcdnsmasq.conf' />
+ <resource name='dnsmasq.conf' />
+ </by-organisation>
+ </public-domain>
+ </within>
<within dir='deps'>
<with-license id='BSD2ClauseXenServerJava'>
<copyright-notice>