From 0b91bac24ba55b6b651be1664ba4e815e1aab331 Mon Sep 17 00:00:00 2001 From: Adam Pippin Date: Tue, 25 Feb 2020 14:10:33 -0800 Subject: [PATCH] Update license + readme --- LICENSE.md | 1 - LICENSE.txt | 11 +++++++++++ README.md | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) delete mode 100644 LICENSE.md create mode 100644 LICENSE.txt diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 14f5757..0000000 --- a/LICENSE.md +++ /dev/null @@ -1 +0,0 @@ -Proprietary. diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..0bd9cd0 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,11 @@ +Copyright 2019-2020 Adam Pippin + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 7b3691c..3b42a8b 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,10 @@ Encrypting a new file with a local pgp key: sops --encrypted-suffix _encrypted -i --pgp ABCD1234ABCD1234ABCD1234 --encrypt myfile.yaml +Encrypting a new file with AWS: + + sops --encrypted-suffix _encrypted -i --kms arn:aws:kms:us-west-2:123412341234:key/11111111-2222-3333-4444-555555555555 --encrypt myfile.yaml + ### aws aws: