diff --git a/CA/geninter.sh b/CA/geninter.sh index 2aa64a84..6c0528d1 100755 --- a/CA/geninter.sh +++ b/CA/geninter.sh @@ -1,19 +1,20 @@ #!/bin/bash -# Copyright [2010] [Anso Labs, LLC] -# -# 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 -# +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# 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. - +# 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. # ARG is the id of the user export SUBJ=/C=US/ST=California/L=Mountain View/O=Anso Labs/OU=Nova Dev/CN=customer-intCA-$3 diff --git a/CA/genrootca.sh b/CA/genrootca.sh index e21f48d7..31976092 100755 --- a/CA/genrootca.sh +++ b/CA/genrootca.sh @@ -1,18 +1,20 @@ #!/bin/bash -# Copyright [2010] [Anso Labs, LLC] +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. # -# 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 +# 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 +# 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. +# 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 [ -f "cacert.pem" ]; then diff --git a/CA/openssl.cnf.tmpl b/CA/openssl.cnf.tmpl index b06f1cca..639b8e80 100644 --- a/CA/openssl.cnf.tmpl +++ b/CA/openssl.cnf.tmpl @@ -1,16 +1,18 @@ -# Copyright [2010] [Anso Labs, LLC] -# -# 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 -# +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# 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. +# 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. # # OpenSSL configuration file. diff --git a/bin/dhcpleasor.py b/bin/dhcpleasor.py index 30f8fbdc..31f4433f 100755 --- a/bin/dhcpleasor.py +++ b/bin/dhcpleasor.py @@ -5,8 +5,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, LLC -# # 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 diff --git a/builddeb.sh b/builddeb.sh index 2fb20da2..e354dc24 100755 --- a/builddeb.sh +++ b/builddeb.sh @@ -1,12 +1,9 @@ #!/bin/sh -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, LLC -# # 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 @@ -20,3 +17,4 @@ # under the License. dpkg-buildpackage -b -rfakeroot -tc -uc -D + diff --git a/docs/architecture.rst b/docs/architecture.rst index 0000a02d..11813d2c 100644 --- a/docs/architecture.rst +++ b/docs/architecture.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/auth.rst b/docs/auth.rst index c906a481..476ca915 100644 --- a/docs/auth.rst +++ b/docs/auth.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/binaries.rst b/docs/binaries.rst index fa6127bb..90a9581f 100644 --- a/docs/binaries.rst +++ b/docs/binaries.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 @@ -30,4 +28,4 @@ The configuration of these binaries relies on "flagfiles" using the google gflags package. If present, the nova.conf file will be used as the flagfile - otherwise, it must be specified on the command line:: - $ python node_worker.py --flagfile flagfile \ No newline at end of file + $ python node_worker.py --flagfile flagfile diff --git a/docs/compute.rst b/docs/compute.rst index 7b4f82a3..5b08dbd5 100644 --- a/docs/compute.rst +++ b/docs/compute.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/conf.py b/docs/conf.py index bc61f438..784d8c09 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'nova' -copyright = u'2010, Anso Labs, LLC' +copyright = u'2010, United States Government as represented by the Administrator of the National Aeronautics and Space Administration.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/endpoint.rst b/docs/endpoint.rst index 830c9966..399df416 100644 --- a/docs/endpoint.rst +++ b/docs/endpoint.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/fakes.rst b/docs/fakes.rst index 1454ca7b..bea8bc4e 100644 --- a/docs/fakes.rst +++ b/docs/fakes.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/getting.started.rst b/docs/getting.started.rst index 55a73dd0..3eadd088 100644 --- a/docs/getting.started.rst +++ b/docs/getting.started.rst @@ -1,3 +1,20 @@ +.. + Copyright 2010 United States Government as represented by the + Administrator of the National Aeronautics and Space Administration. + All Rights Reserved. + + 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. + Getting Started with Nova ========================= diff --git a/docs/index.rst b/docs/index.rst index 9a5fa32a..039bf00f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/modules.rst b/docs/modules.rst index 11e1eef7..82c61f00 100644 --- a/docs/modules.rst +++ b/docs/modules.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/network.rst b/docs/network.rst index 2787ae45..357a0517 100644 --- a/docs/network.rst +++ b/docs/network.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 @@ -87,4 +85,4 @@ Public Traffic:: The RoutingNode is currently implemented using IPTables rules, which implement both NATing of public IP addresses, and the appropriate firewall chains. We are also looking at using Netomata / Clusto to manage NATting within a switch or router, and/or to manage firewall rules within a hardware firewall appliance. -Similarly, the AddressingNode currently manages running DNSMasq instances for DHCP services. However, we could run an internal DHCP server (using Scapy ala Clusto), or even switch to static addressing by inserting the private address into the disk image the same way we insert the SSH keys. (See compute for more details). \ No newline at end of file +Similarly, the AddressingNode currently manages running DNSMasq instances for DHCP services. However, we could run an internal DHCP server (using Scapy ala Clusto), or even switch to static addressing by inserting the private address into the disk image the same way we insert the SSH keys. (See compute for more details). diff --git a/docs/nova.rst b/docs/nova.rst index 01da3441..4b9c44a5 100644 --- a/docs/nova.rst +++ b/docs/nova.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/objectstore.rst b/docs/objectstore.rst index 70048354..6b8d293f 100644 --- a/docs/objectstore.rst +++ b/docs/objectstore.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/packages.rst b/docs/packages.rst index fb28e850..6029ad7d 100644 --- a/docs/packages.rst +++ b/docs/packages.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/docs/storage.rst b/docs/storage.rst index f8c98b18..f77e5f0e 100644 --- a/docs/storage.rst +++ b/docs/storage.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 @@ -30,4 +28,4 @@ There are three primary classes of storage in a nova cloud environment: :maxdepth: 2 volume - objectstore \ No newline at end of file + objectstore diff --git a/docs/volume.rst b/docs/volume.rst index 3981daf9..61996845 100644 --- a/docs/volume.rst +++ b/docs/volume.rst @@ -3,8 +3,6 @@ Administrator of the National Aeronautics and Space Administration. All Rights Reserved. - Copyright 2010 Anso Labs, LLC - 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 diff --git a/exercise_rsapi.py b/exercise_rsapi.py index 4b9e65fc..20589b9c 100644 --- a/exercise_rsapi.py +++ b/exercise_rsapi.py @@ -1,3 +1,21 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# 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. + import cloudservers class IdFake: diff --git a/run_tests.py b/run_tests.py index d6f68f83..bd1587d4 100644 --- a/run_tests.py +++ b/run_tests.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, LLC -# # 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 diff --git a/setup.py b/setup.py index 95d0ee7d..eb42283e 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, LLC -# # 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