From e7a66ce082ce755e0b602df21c7311c727ebb506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Aug 2023 14:12:18 +0200 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'clan-core': 'git+https://git.clan.lol/clan/clan-core?ref=refs/heads/main&rev=6f22717ffd26aeb5146d727d14e1c64d56a20218' (2023-08-08) → 'git+https://git.clan.lol/clan/clan-core?ref=refs/heads/main&rev=6934b0a056fd32a5ceff04ba721dec3177583295' (2023-08-08) flake.lock: Update Flake lock file updates: • Updated input 'clan-core': 'git+https://git.clan.lol/clan/clan-core?ref=refs/heads/main&rev=6934b0a056fd32a5ceff04ba721dec3177583295' (2023-08-08) → 'git+https://git.clan.lol/clan/clan-core?ref=refs/heads/main&rev=1ca04c2829e0dcd139eda5f3ed63dfb9a5828b1c' (2023-08-08) flake.lock: Update Flake lock file updates: • Updated input 'clan-core': 'git+https://git.clan.lol/clan/clan-core?ref=refs/heads/main&rev=1ca04c2829e0dcd139eda5f3ed63dfb9a5828b1c' (2023-08-08) → 'git+https://git.clan.lol/clan/clan-core?ref=refs/heads/main&rev=b2f30bd6009fbe3836a0ad20545f8440ffe31289' (2023-08-08) --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 2911ab6..8730106 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,11 @@ ] }, "locked": { - "lastModified": 1691495095, - "narHash": "sha256-0q1ZYH447GNKhBsFbWCZ1GUrIvrwDUa3/8Aa1r4/K+U=", + "lastModified": 1691497301, + "narHash": "sha256-9ob2utfKSjt/MYI35mh83lTmWuRj3wzJh9WQlaZPiyg=", "ref": "refs/heads/main", - "rev": "6f22717ffd26aeb5146d727d14e1c64d56a20218", - "revCount": 226, + "rev": "b2f30bd6009fbe3836a0ad20545f8440ffe31289", + "revCount": 235, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, From f374bf8f8a40abef7a41af023ba6d584504134a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Aug 2023 14:13:13 +0200 Subject: [PATCH 2/3] import clan-cli into devshell --- devShells/flake-module.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/devShells/flake-module.nix b/devShells/flake-module.nix index c06d709..06706a8 100644 --- a/devShells/flake-module.nix +++ b/devShells/flake-module.nix @@ -8,6 +8,9 @@ packages = [ pkgs.bashInteractive pkgs.sops + + inputs'.clan-core.packages.clan-cli + (pkgs.terraform.withPlugins (p: [ p.hetznerdns p.hcloud From 3801b18baa7c78a60289151211d283c8c7791f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Aug 2023 15:53:59 +0200 Subject: [PATCH 3/3] import sops keys into clan secrets --- sops/machines/web01/key.json | 4 ++++ sops/users/dave/key.json | 4 ++++ sops/users/joerg/key.json | 4 ++++ sops/users/lassulus/key.json | 4 ++++ 4 files changed, 16 insertions(+) create mode 100755 sops/machines/web01/key.json create mode 100755 sops/users/dave/key.json create mode 100755 sops/users/joerg/key.json create mode 100755 sops/users/lassulus/key.json diff --git a/sops/machines/web01/key.json b/sops/machines/web01/key.json new file mode 100755 index 0000000..0cb442b --- /dev/null +++ b/sops/machines/web01/key.json @@ -0,0 +1,4 @@ +{ + "publickey": "age17xuvz0fqtynzdmf8rfh4g3e46tx8w3mc6zgytrmuj5v9dhnldgxs7ue7ct", + "type": "age" +} \ No newline at end of file diff --git a/sops/users/dave/key.json b/sops/users/dave/key.json new file mode 100755 index 0000000..552a5d3 --- /dev/null +++ b/sops/users/dave/key.json @@ -0,0 +1,4 @@ +{ + "publickey": "age1vphy2sr6uw4ptsua3gh9khrm2cqyt65t46tusmt44z98qa7q6ymq6prrdl", + "type": "age" +} \ No newline at end of file diff --git a/sops/users/joerg/key.json b/sops/users/joerg/key.json new file mode 100755 index 0000000..a63d9d1 --- /dev/null +++ b/sops/users/joerg/key.json @@ -0,0 +1,4 @@ +{ + "publickey": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", + "type": "age" +} \ No newline at end of file diff --git a/sops/users/lassulus/key.json b/sops/users/lassulus/key.json new file mode 100755 index 0000000..ee6de72 --- /dev/null +++ b/sops/users/lassulus/key.json @@ -0,0 +1,4 @@ +{ + "publickey": "age1eq0e6uhjj2tja8v338tkdz8ema2aw5anpuyaq2uru7rt4lq7msyqqut6m2", + "type": "age" +} \ No newline at end of file