Jörg Thalheim
73ca793539
Revert "remove drone (replaced by github ci)"
...
This reverts commit d717ee155e
2021-11-07 09:27:15 +01:00
Jörg Thalheim
8318a036fe
another test commit
2021-11-04 22:35:35 +01:00
Jörg Thalheim
b85ea605cd
test commit
2021-11-04 22:20:59 +01:00
Jörg Thalheim
2e86e1698d
README.md: add link to infrastructure repository
2021-10-03 17:10:32 +02:00
Jörg Thalheim
095fca0581
Merge pull request #124 from Mic92/feat/nixos-instead-of-nixpkgs
...
workflow: Replace nixpkgs channel with nixos
2021-09-30 21:20:39 +01:00
Janne Heß
0078d93306
Merge branch 'master' into feat/nixos-instead-of-nixpkgs
2021-09-30 22:19:54 +02:00
Jörg Thalheim
8ccc5c7605
Merge pull request #114 from helsinki-systems/feat/nested-secrets
...
Implement nested secrets
2021-09-30 21:19:23 +01:00
Janne Heß
64e8411831
workflow: Replace nixpkgs channel with nixos
2021-09-30 21:58:40 +02:00
Janne Heß
2b9a0815ca
Implement nested secrets
2021-09-30 21:49:47 +02:00
Janne Heß
827696f6a2
Merge pull request #121 from Mic92/improve-assertions
...
Improve assertions
2021-09-30 21:37:47 +02:00
Jörg Thalheim
e0e57da497
fix documentation and assertions for age.keyFile
2021-09-30 21:10:08 +02:00
Jörg Thalheim
c5e0f55d8d
nixos-tests: fix identations
2021-09-30 21:09:26 +02:00
Jörg Thalheim
d7a6402532
Merge pull request #123 from Mic92/feat/import-age-keyfile-and-ssh
...
Import age keyfile and ssh keys at the same time
2021-09-30 20:05:18 +01:00
Janne Heß
4cebc08062
Fix age key generation and test it
2021-09-30 15:28:39 +02:00
Janne Heß
5db02f2939
Import age keyfile and ssh keys at the same time
2021-09-30 15:07:30 +02:00
Jörg Thalheim
a3e3dc7710
Merge pull request #122 from Mic92/feat/swap-age-keys
...
Swap order of age ssh keys and the key file
2021-09-30 14:04:10 +01:00
Janne Heß
9083e64fb9
Swap order of age ssh keys and the key file
...
It makes more sense to import the key when we have one and ignore the
SSH keys instead of only importing the key when we have no SSH keys.
This is because we import all SSH keys by default in the module and
using a key file means the use has to explicitly unset the SSH keys.
2021-09-30 14:05:38 +02:00
Jörg Thalheim
ae84c313c5
Merge pull request #119 from VergeDX/master
...
[F] Fix typo in README.md, 2a -> 2b.
2021-09-29 07:17:42 +01:00
Vanilla
1f947f9fa4
[F] Fix typo in README.md, 2a -> 2b.
2021-09-29 11:01:06 +08:00
Janne Heß
8c5c313b56
Merge pull request #117 from Mic92/age-fix
...
import ssh keys both for gpg and age
2021-09-28 14:38:07 +02:00
Jörg Thalheim
a38ba56ca2
import ssh keys both for gpg and age
2021-09-28 14:07:26 +02:00
Jörg Thalheim
38e9270b77
README: improve age config
2021-09-25 22:37:58 +02:00
Jörg Thalheim
64235a958b
Merge pull request #107 from helsinki-systems/feat/age-support-2
...
Add age support, second attempt
2021-09-24 13:15:30 +01:00
Janne Heß
0b99142c90
Rename ssh-*-to-age to ssh-to-age
2021-09-24 12:09:54 +02:00
Janne Heß
77d0fa5920
Simplify age logic in sops-install-secrets
2021-09-24 12:09:54 +02:00
Janne Heß
0cad90d763
Update all go dependencies
2021-09-24 12:09:54 +02:00
Janne Heß
f636296aff
Switch the libs to now external ones
2021-09-24 12:09:53 +02:00
Janne Heß
6c916c1f57
Add a converter from private ssh keys to age
2021-09-24 12:09:53 +02:00
Janne Heß
4568162629
Import age ssh keys by default
2021-09-24 12:09:53 +02:00
Janne Heß
44d91e885e
Add review suggestions
2021-09-24 12:09:53 +02:00
Janne Heß
19089e588f
Document age usage in the README
2021-09-24 12:09:53 +02:00
Janne Heß
c980f2547e
Add sops-ssh-to-age tool
2021-09-24 12:09:52 +02:00
Janne Heß
db8fcb50a3
Add support for ssh-generated age keys
2021-09-24 12:09:52 +02:00
Janne Heß
b21c0ce3a8
Group gnupg and age in the module
2021-09-24 12:09:52 +02:00
Janne Heß
f5a2ba217b
Add age support
2021-09-24 12:09:52 +02:00
Jörg Thalheim
9d47d2e3e4
Merge pull request #116 from helsinki-systems/fix/unstable-pipeline
...
Fix pipeline on unstable
2021-09-18 07:43:33 +01:00
Janne Heß
ebfa120b52
Fix pipeline on unstable
2021-09-17 21:08:34 +02:00
Jörg Thalheim
32d94573f7
Merge pull request #115 from Mic92/dependabot/github_actions/cachix/install-nix-action-14
...
Bump cachix/install-nix-action from 13 to 14
2021-09-14 07:05:48 +01:00
dependabot[bot]
8fa49a400a
Bump cachix/install-nix-action from 13 to 14
...
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action ) from 13 to 14.
- [Release notes](https://github.com/cachix/install-nix-action/releases )
- [Commits](https://github.com/cachix/install-nix-action/compare/v13...v14 )
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 22:02:21 +00:00
Jörg Thalheim
3e4ebc851c
Merge pull request #111 from Mic92/openpgp
...
switch to maintained openpgp library
2021-08-29 17:37:03 +01:00
Jörg Thalheim
4919735a5e
fork sops with new openpgp library
2021-08-29 16:20:30 +00:00
slekky
419e21b80f
Adding logo ( #112 )
2021-08-29 15:04:06 +01:00
Jörg Thalheim
3e2aefbc61
switch to maintained openpgp library
2021-08-29 15:24:07 +02:00
Jörg Thalheim
024c079aa1
Merge pull request #109 from helsinki-systems/feat/update-nixpkgs-version
...
workflow: Update nixos channel to 21.05
2021-08-28 11:12:23 +01:00
Janne Heß
1029f6e0c9
workflow: Update nixos channel to 21.05
2021-08-28 12:06:18 +02:00
Janne Heß
f61a391089
Merge pull request #110 from starcraft66/patch-1
...
Add aarch64-darwin to supported systems
2021-08-28 12:03:25 +02:00
Tristan
9b4eade565
Add aarch64-darwin to supported systems
2021-08-28 01:04:18 -04:00
Jörg Thalheim
0d4bdc1c21
Merge pull request #106 from Mic92/master-specialfs
...
modules/sops: activation after specialfs
2021-08-26 20:18:23 +01:00
Jörg Thalheim
f3deaae52f
Merge branch 'master' into master-specialfs
2021-08-26 19:53:56 +01:00
Jörg Thalheim
39d26fad6a
Merge pull request #105 from Mic92/build
...
sops-nix: fix build
2021-08-26 19:26:14 +01:00
