diff options
| author | Jon Grimm <jon.grimm@canonical.com> | 2016-11-22 17:09:53 -0600 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-12-22 17:04:28 -0500 |
| commit | b2a9f33616c806ae6e052520a8589113308f567c (patch) | |
| tree | e24d64e56104dfa1b608a9f255c9b8f618e45cc0 /cloudinit/gpg.py | |
| parent | 0b0f254a6935a1b1fff128fa177152dd519e1a3d (diff) | |
| download | vyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.tar.gz vyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.zip | |
LICENSE: Allow dual licensing GPL-3 or Apache 2.0
This has been a recurring ask and we had initially just made the change to
the cloud-init 2.0 codebase. As the current thinking is we'll just
continue to enhance the current codebase, its desirable to relicense to
match what we'd intended as part of the 2.0 plan here.
- put a brief description of license in LICENSE file
- put full license versions in LICENSE-GPLv3 and LICENSE-Apache2.0
- simplify the per-file header to reference LICENSE
- tox: ignore H102 (Apache License Header check)
Add license header to files that ship.
Reformat headers, make sure everything has vi: at end of file.
Non-shipping files do not need the copyright header,
but at the moment tests/ have it.
Diffstat (limited to 'cloudinit/gpg.py')
| -rw-r--r-- | cloudinit/gpg.py | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/cloudinit/gpg.py b/cloudinit/gpg.py index 5bbff513..70c620de 100644 --- a/cloudinit/gpg.py +++ b/cloudinit/gpg.py @@ -1,22 +1,11 @@ -"""gpg.py - Collection of gpg key related functions""" -# vi: ts=4 expandtab -# -# Copyright (C) 2016 Canonical Ltd. -# -# Author: Scott Moser <scott.moser@canonical.com> -# Author: Christian Ehrhardt <christian.ehrhardt@canonical.com> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3, as -# published by the Free Software Foundation. +# Copyright (C) 2016 Canonical Ltd. # -# This program 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. +# Author: Scott Moser <scott.moser@canonical.com> +# Author: Christian Ehrhardt <christian.ehrhardt@canonical.com> # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# This file is part of cloud-init. See LICENSE file for license information. + +"""gpg.py - Collection of gpg key related functions""" from cloudinit import log as logging from cloudinit import util @@ -72,3 +61,5 @@ def getkeybyid(keyid, keyserver='keyserver.ubuntu.com'): delete_key(keyid) return armour + +# vi: ts=4 expandtab |