Adrian Utrilla
ae93caf2c6
Merge pull request #440 from rabadin/add-gpg-keyserver-env-var
...
Add support for custom GPG key servers
2019-03-12 17:16:54 +01:00
rabadin
bca9526566
Rewiew fix: update documentation
2019-03-12 13:57:12 +01:00
rabadin
410a687a35
Add support for custom GPG key servers
...
Add support for the SOPS_GPG_KEYSERVER environment variable to
override the default GPG key server (gpg.mozilla.org).
2019-03-12 12:17:33 +01:00
Julien Vehent [:ulfr]
c968ce2e3b
Merge pull request #433 from mozilla/jvehent-patch-1
...
Update README.rst
2019-03-04 11:14:16 -05:00
Julien Vehent [:ulfr]
3664649ec8
Update README.rst
2019-03-02 07:58:26 -05:00
Adrian Utrilla
e908da7097
Merge pull request #421 from mozilla/consolidate-example-trees
...
Consolidate example trees
2019-02-27 22:17:03 +01:00
Adrian Utrilla
2712e3770f
Merge branch 'master' into consolidate-example-trees
2019-02-27 22:03:21 +01:00
Adrian Utrilla
0f197e5e5a
Merge pull request #420 from mozilla/dotenv-comment-support
...
Add comment support to dotenv store
2019-02-27 22:00:46 +01:00
Adrian Utrilla
5b420d9280
Merge branch 'master' into consolidate-example-trees
2019-02-27 21:51:19 +01:00
Adrian Utrilla
c262b5ab3b
Merge branch 'master' into dotenv-comment-support
2019-02-27 21:49:56 +01:00
Adrian Utrilla
8cbb1dcf86
Merge pull request #431 from jkroepke/patch-1
...
Add vi to known editors
2019-02-27 21:20:21 +01:00
Jan-Otto Kröpke
134d63ee39
Add vi to known editors
...
By default on alpine there is just vi (busybox compat).
2019-02-27 20:22:43 +01:00
Adrian Utrilla
160b25f6dc
Merge pull request #430 from sergey-shambir/fix-no-vim-panic
...
Fixed panic when nano available, but vim is not installed
2019-02-26 14:01:34 +01:00
Adrian Utrilla
5dfa5348ef
Update cmd/sops/edit.go
...
Co-Authored-By: sergey-shambir <sergey.shambir.auto@gmail.com >
2019-02-26 15:36:30 +03:00
Adrian Utrilla
be7561dec2
Update error message when editor not found
...
Co-Authored-By: sergey-shambir <sergey.shambir.auto@gmail.com >
2019-02-26 15:28:30 +03:00
Sergey Shambir
fd130957e6
Fixed panic when nano available, but vim is not installed
...
Command `which vim nano` returns 1 when only nano editor is installed
The solutions is to use exec.LookPath
2019-02-26 15:08:15 +03:00
Adrian Utrilla
a2d0328e35
Merge pull request #423 from marky-mark/master
...
AWS Profile fix
2019-01-28 09:49:20 +01:00
Mark Kelly
068cb5a805
AWS Profiles - use credentials only if not null
2019-01-25 12:53:34 +00:00
Mark Kelly
ac5ca1f05c
AWS Profiles
2019-01-25 12:42:41 +00:00
Adrian Utrilla
988e49994d
Merge pull request #422 from mozilla/revert-416-master
...
Revert "AWS Profile"
2019-01-24 17:00:43 +01:00
Adrian Utrilla
9a56f8055e
Revert "AWS Profile"
2019-01-24 16:50:41 +01:00
Adrian Utrilla
d77ae5b1be
Add comment support to dotenv store
2019-01-23 11:07:05 +01:00
Adrian Utrilla
bbf17b3d84
Consolidate example trees
2019-01-23 10:54:27 +01:00
Adrian Utrilla
3383f2dc95
Merge pull request #416 from marky-mark/master
...
AWS Profile
2019-01-14 13:02:26 +01:00
mark kelly
eb7b22a4a0
Merge branch 'master' into master
2019-01-14 10:44:55 +00:00
Mark Kelly
30e1380e8a
keysource.go review changes
2019-01-14 10:28:33 +00:00
Mark Kelly
ada410bc49
main.go review update
2019-01-14 10:26:26 +00:00
Mark Kelly
cc3fec53a2
README update
2019-01-14 10:22:16 +00:00
Mark Kelly
6fa25e7ccb
Merge branch 'master' of https://github.com/marky-mark/sops
2019-01-11 17:13:17 +00:00
Mark Kelly
7605dd76b1
Added aws_profile
...
* Decrypt
* Command Line
* Master Key
* Encrypt
* .sops.yaml
2019-01-11 17:11:43 +00:00
Mark Kelly
1d8a696d8f
added readme and put back in assume role
2019-01-11 17:00:21 +00:00
Mark Kelly
d24f587732
Added aws_profile
...
* Command Line argument fix for group add
2019-01-11 16:30:09 +00:00
Mark Kelly
dac465b7aa
Added aws_profile
...
* Command Line argument fix
2019-01-11 16:09:09 +00:00
Mark Kelly
7fdf7202c4
Added aws_profile
...
* Encrypt
* .sops.yaml marshall
2019-01-11 15:41:44 +00:00
Mark Kelly
9d4185fbe7
Added aws_profile
...
* Decrypt
* Command Line
* Master Key
2019-01-11 14:40:28 +00:00
Adrian Utrilla
cfc6fa1dbc
Merge pull request #415 from sagansystems/aws-kms-aliases
...
Support referencing AWS KMS keys by aliases
2019-01-11 10:55:32 +01:00
Adrian Utrilla
7a78a69d77
Merge branch 'master' into aws-kms-aliases
2019-01-11 10:16:05 +01:00
Adrian Utrilla
e398d1ce0e
Merge pull request #400 from oldpatricka/ini
...
Added support for ini file store
2019-01-11 10:15:54 +01:00
Adrian Utrilla
ed25385c4d
Merge branch 'master' into aws-kms-aliases
2019-01-11 10:06:44 +01:00
Patrick Armstrong
778bddc78b
Add clarification of filetypes to README.
2019-01-10 21:41:46 -08:00
Patrick Armstrong
9b364dccef
Added ini file example.
...
Note that this adds both a example file to the top level of the
repository, as well as special case handling of the Example file when
doing a sops -i newfile.ini, since the ini store doesn't support the
tree structure of the existing example.
2019-01-10 21:36:16 -08:00
Patrick Armstrong
d3375f8753
Ran gofmt/goimports on ini store files.
2019-01-10 21:36:16 -08:00
Patrick Armstrong
dc4a697500
Switched ini to same flattening scheme as .env implementation
2019-01-10 21:36:16 -08:00
Patrick Armstrong
c70c52be58
Added support for ini files
2019-01-10 21:36:16 -08:00
Daren Desjardins
532c36eebc
Support referencing AWS KMS keys by aliases
...
- addresses issue #381
2019-01-10 14:42:10 -08:00
Adrian Utrilla
88917267e0
Merge pull request #414 from arainho/patch-1
...
fix line to import test key
2019-01-04 14:50:41 +01:00
André Rainho
5b48aa34f2
fix line to import test key
...
rename folder tests to pgp in order to import test key
2019-01-04 12:04:20 +00:00
Adrian Utrilla
8fcd61e8a3
Merge pull request #398 from jkroepke/patch-1
...
Use $HOME instead ~ to find the gnupg directory.
2018-11-25 10:41:38 -05:00
Jan-Otto Kröpke
b72e3bf3f1
Use $HOME instead ~ to find the gnupg directory.
2018-11-25 16:27:36 +01:00
Adrian Utrilla
108e66f46f
Merge pull request #392 from jar-o/yaml-multidoc
...
Add multidoc encrypt/decrypt for YAML sources
2018-11-21 10:29:50 -06:00