From be4cb64c92d5f77aab4d4ad8ae2a5fb6fcfd2e97 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 28 Feb 2012 19:08:09 -0500 Subject: [PATCH] Relicensing to GPLv3, all previous committers ok'd on mailing list. --- README.md | 2 +- bin/ansible | 30 +++++++++++++---------------- docs/man/man1/ansible.1.asciidoc | 3 +-- lib/ansible/__init__.py | 17 ++++++++++++++++ lib/ansible/constants.py | 18 +++++++++++++++++ lib/ansible/playbook.py | 32 ++++++++++++++----------------- lib/ansible/runner.py | 33 +++++++++++++++----------------- library/command | 18 +++++++++++++++++ library/copy | 18 +++++++++++++++++ library/facter | 18 +++++++++++++++++ library/git | 17 ++++++++++++++++ library/ohai | 18 +++++++++++++++++ library/ping | 17 ++++++++++++++++ library/service | 17 ++++++++++++++++ library/setup | 17 ++++++++++++++++ library/template | 17 ++++++++++++++++ 16 files changed, 236 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index f9935e9511c..791075d979c 100644 --- a/README.md +++ b/README.md @@ -197,7 +197,7 @@ See github's issue tracker for what we're thinking about License ======= -MIT +GPLv3 Mailing List ============ diff --git a/bin/ansible b/bin/ansible index e98e36c3e33..16d94896874 100755 --- a/bin/ansible +++ b/bin/ansible @@ -1,25 +1,21 @@ #!/usr/bin/python -# Copyright (c) 2012 Michael DeHaan +# (c) 2012, Michael DeHaan # -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, sublicense, and/or sell copies of the Software, -# and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: +# This file is part of Ansible # -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . from optparse import OptionParser import json diff --git a/docs/man/man1/ansible.1.asciidoc b/docs/man/man1/ansible.1.asciidoc index da2d429345f..c4be91507b9 100644 --- a/docs/man/man1/ansible.1.asciidoc +++ b/docs/man/man1/ansible.1.asciidoc @@ -99,8 +99,7 @@ COPYRIGHT Copyright © 2012, Michael DeHaan -Ansible is released under the terms of the MIT license. - +Ansible is released under the terms of the GPLv3 License. SEE ALSO diff --git a/lib/ansible/__init__.py b/lib/ansible/__init__.py index e69de29bb2d..ef0828d8b51 100755 --- a/lib/ansible/__init__.py +++ b/lib/ansible/__init__.py @@ -0,0 +1,17 @@ +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 0b759b0eb66..666a00ebf7d 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -1,3 +1,21 @@ +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# + # control side (aka 'overlord') DEFAULT_HOST_LIST = '/etc/ansible/hosts' DEFAULT_MODULE_PATH = '/usr/share/ansible' diff --git a/lib/ansible/playbook.py b/lib/ansible/playbook.py index 1acf6d06ad5..0c5377d2ff2 100755 --- a/lib/ansible/playbook.py +++ b/lib/ansible/playbook.py @@ -1,23 +1,19 @@ -# Copyright (c) 2012 Michael DeHaan +# (c) 2012, Michael DeHaan # -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, sublicense, and/or sell copies of the Software, -# and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: +# This file is part of Ansible # -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . import ansible.runner import ansible.constants as C diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py index e505ac76407..594b6f3d3da 100755 --- a/lib/ansible/runner.py +++ b/lib/ansible/runner.py @@ -1,23 +1,20 @@ -# Copyright (c) 2012 Michael DeHaan +# (c) 2012, Michael DeHaan # -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without restriction, -# including without limitation the rights to use, copy, modify, merge, -# publish, distribute, sublicense, and/or sell copies of the Software, -# and to permit persons to whom the Software is furnished to do so, -# subject to the following conditions: +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . # -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import fnmatch import multiprocessing diff --git a/library/command b/library/command index 0f912e0b69e..d1b43c1a117 100755 --- a/library/command +++ b/library/command @@ -1,5 +1,23 @@ #!/usr/bin/python +# (c) 2012, Michael DeHaan , and others +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# + try: import json except ImportError: diff --git a/library/copy b/library/copy index bd8c86ccb3f..288929a89a8 100644 --- a/library/copy +++ b/library/copy @@ -1,5 +1,23 @@ #!/usr/bin/python +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# + import sys import os import shlex diff --git a/library/facter b/library/facter index b7a0fa6588b..16bbbbe93ef 100644 --- a/library/facter +++ b/library/facter @@ -1,5 +1,23 @@ #!/usr/bin/bash +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# + # things that must be installed to use this # facter # ruby-json diff --git a/library/git b/library/git index 873d8a1638d..9fe4ba7437f 100755 --- a/library/git +++ b/library/git @@ -1,5 +1,22 @@ #!/usr/bin/python +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + # I wanted to keep this simple at first, so for now this checks out # from the MASTER branch of a repo at a particular SHA or # tag. Latest is not supported, you should not be doing diff --git a/library/ohai b/library/ohai index db3afd5b4b9..9ad520eead9 100644 --- a/library/ohai +++ b/library/ohai @@ -1,5 +1,23 @@ #!/usr/bin/python +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# + # requires 'ohai' to be installed try: diff --git a/library/ping b/library/ping index 11a2e65a2c7..45264061656 100644 --- a/library/ping +++ b/library/ping @@ -1,5 +1,22 @@ #!/usr/bin/python +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + try: import json except ImportError: diff --git a/library/service b/library/service index e28aa8ff8ea..5572df0ea43 100755 --- a/library/service +++ b/library/service @@ -1,5 +1,22 @@ #!/usr/bin/python +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + try: import json except ImportError: diff --git a/library/setup b/library/setup index 609d361f8d4..a79a8a91258 100755 --- a/library/setup +++ b/library/setup @@ -1,5 +1,22 @@ #!/usr/bin/python +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + DEFAULT_ANSIBLE_SETUP = "/etc/ansible/setup" import sys diff --git a/library/template b/library/template index 8868350ae86..fd454df42e6 100644 --- a/library/template +++ b/library/template @@ -1,5 +1,22 @@ #!/usr/bin/python +# (c) 2012, Michael DeHaan +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . + import sys import os import jinja2