From c3c9a0ddf517795bbe66f7f0ee66f1ca909fed78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Mar 2025 08:12:53 +0100 Subject: [PATCH] remove julien --- .sops.yaml | 2 - .../secrets/backup_share_ssh_key | 10 ++--- .../secrets/borg_encryption_passphrase | 10 ++--- .../nixos-wiki.nixos.org/secrets/secrets.yaml | 39 +++++++------------ 4 files changed, 21 insertions(+), 40 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index dd123e1..3e0eb61 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -2,12 +2,10 @@ keys: - &joerg age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz - &nixos-wiki2 age1p3dl7q5ahjdhl3g72mqk9pxy3gcptw9dqmg6syq9f9s03ppqp4rsqm93n2 - &lassulus age1eq0e6uhjj2tja8v338tkdz8ema2aw5anpuyaq2uru7rt4lq7msyqqut6m2 - - &julienmalka age109qksyjgdnf7elnk98dh4vtxt0epju7xjemlqng0j0x75st5zg9qm9h3hy creation_rules: - path_regex: targets/nixos-wiki\.nixos\.org/secrets/* key_groups: - age: - *joerg - *lassulus - - *julienmalka - *nixos-wiki2 diff --git a/targets/nixos-wiki.nixos.org/secrets/backup_share_ssh_key b/targets/nixos-wiki.nixos.org/secrets/backup_share_ssh_key index 3e7e0f9..b409a02 100644 --- a/targets/nixos-wiki.nixos.org/secrets/backup_share_ssh_key +++ b/targets/nixos-wiki.nixos.org/secrets/backup_share_ssh_key @@ -8,19 +8,15 @@ "age": [ { "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1anplUWVpTDNXMUNYQlhn\nTklOc1FGQTV4T0tVeURTdnZISjV6azYvZFFBClB6Q3JncXRZTE1TclVkazFscng1\ncFVzYUNSKy82N0ZkQWFmb2IvU2p1WWsKLS0tIHd2SU1jRFlQN284RjRpMjVuZHZ0\nc24zUldEWW5jZUIzSjI0VzBTaU9rZ1UK1N1G5EWy6uisnUoBQmUpINIyN+f1/vnX\nTrHn8uHcydiM6wZyAxzdwOV53HWxZ8m4MQTS0CXa2S/z+HGRkTsotg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6OGV1YTZ5NkRWVUMvUHQw\nbERhTDBIME0rNWJCSGJ1allNbFJEbXRld2t3CmNkdlF4bTVYRDduOTFoTDlIU3F2\nSC9ISjJzMDhkMjN6ZUVYeW8xNFhHa0UKLS0tIC9DOG5KMEJkNkRWaGdmaGl6Mmxp\nYmRoRkJ1UkJlQ2h4NHkreGdwcy9QN3MKoj4Np/hIBOMOuSTwUypw+n9NTbABbrbY\nUWAivOBLGXjrg73gyCYhiPihbpjzhxyaWrkDyhDYE6LxJgqrqkUGJw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1eq0e6uhjj2tja8v338tkdz8ema2aw5anpuyaq2uru7rt4lq7msyqqut6m2", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjQk1xV1c0VVpqS1NnTERi\nc1pnMkV1ODRrS0dScTBrTUFreG40bGxseUZZCkJ3elVYWkJoaWNSOEE1cFRTUnIr\nejNsK21MTlRJRGxVdmVPeHljcEY3R0kKLS0tIE1HZEl1WlRVejNMWXo2bzFmcnZF\nblpiNU0vT25kV3l1dUFWSzVMVzZlZkUKdlDDCfVRNSDLPFQIGBCLhTSCxs2sZm+C\nBse6v+LRWrgIs0XwJY2Hf4XlZgnnEYw896sSgBz8opeQ4g4mf0Lfuw==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age109qksyjgdnf7elnk98dh4vtxt0epju7xjemlqng0j0x75st5zg9qm9h3hy", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4clM2N3M2SzdPdHRsTGV1\nS1FYV3J1T2Yxa1o3RWlBS3ZReHpQS2dYZFVVCkFrWDNDU2JXaWxDTXN6ckxZLy9H\ndWMvTEZ5WmlKNVFsR2gySzR5ZXlTUmMKLS0tIGtXZUhuUFFtbnVHc0J0d2NiNEE3\nSTRSemtSZHNNYTZsM2R2dFZ1NDBrMlEKINJTmtgKvIPewfGc4cJbMUkyLpr05FqO\ni2D+orxThR9EOiEQkqyDZVnyXV5EKi0X6voArlYonGnON+ixvIVXfA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIZ2VtZzZNeU1MbG9YaU1C\nSEMrSGExNUFCbXpCblltYTZoZCtxcThXQldNCjJKMjVPTmQwUjhZbGg2NlJXRndH\nT3JBSUllNS9JUFo2T1N5Q1RHdS8yZkEKLS0tIDZOVGxjQkZyK0ZKWEVoQ1Y0RTA2\nVDNLVWxiQkJzSCsrZ3NiMGhUY0p3SGMKm0aff8HWwgRBX4TTnWDxozP34e06XHqe\n3zV9tf3b4D8A+kGrIUFH8cDwonZFI/UzmLYGMwTdR6pQY2nqFQ/yHQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1p3dl7q5ahjdhl3g72mqk9pxy3gcptw9dqmg6syq9f9s03ppqp4rsqm93n2", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIdnlLdE5EWlVLOGg3UllH\nVGU1YnFXSGhhbTA4YzEzRzVjY2lOOXBqU3g4CkRkM2E3WGt0TFBiOEo1TzlKSlZ5\nWXNOVXRqR0c2SUJCSUpLV2VVSUVNNkkKLS0tIGE2SVVsRUZ1WE9MV2xQdDI4Q0pS\neVVOeTFqM0Nna1JiWWIwUFVaMlpiMEUKR+uMYSznyF/96fASHi2PUMy/cN9BSriN\nR0Bur8eEOWTPjOWh6s409SQU0nSDxDxpL0b9ew7uMM9+Fdig7R8IzA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByNUhrR21TOWM0NmNCMXZn\nRnYyZWxzUStTMVEvNm9Rd1V3WkhGa2IzTFhjCmtmRlFjTjZDNkFKQnZ5UU4rOFRM\nTzZUdUVpejdwbGtzNlVHWUI5WlV0ak0KLS0tIFRVcnc4NDVtcnFVbmZ0cVRwdUZa\neGcxcjNXNVJrUFdHdkVYdzdWK3hHY2MKl3HLaFYSNIPTrwj1dYnmZd59cRxMAQUe\n49h+r9F5W/zxyRaJuIYcR4XeQ1hmoclW9/7Sfri9Wb9QCmisGpwWqA==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2024-02-17T16:29:00Z", diff --git a/targets/nixos-wiki.nixos.org/secrets/borg_encryption_passphrase b/targets/nixos-wiki.nixos.org/secrets/borg_encryption_passphrase index 0075095..e177a80 100644 --- a/targets/nixos-wiki.nixos.org/secrets/borg_encryption_passphrase +++ b/targets/nixos-wiki.nixos.org/secrets/borg_encryption_passphrase @@ -8,19 +8,15 @@ "age": [ { "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4c3pEOWR0Zi8yU0FGNWQx\nL3A3Y3Y3TXFFdFBNdmJxV3h3WUIxaFZQcHg4CkM0Mkg0SGdTK3U0Z2RDSUNPLzNa\na05uZ3VlbzBxR1FibVVZa0xZTDRrYVUKLS0tIEUrR3RBdjRKRUdIMm5rUUdEajFN\nSHI4anZRa2g4U2E4enJZdDR6RlNoajAKA01UMRoBgwNtha7W05xK+hYJY6oaVvF8\n9v0oi6a+ZONaboHFmiNK89ojCaI/xmtciRXwIpiZnJeAq5OlUyeuqw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNZWQwVVM1VWVuU3BCMTdG\nK002ZENmcG03OWdsbFV0VXVodjJmeWVoOTJNCktaVEU1Z3owMStpYTl5WVpaSkpL\nLzNHRjNSeWJVbm9PWUNmTHFzUWkxemMKLS0tIGk0TjJNMmx5Ukxqc2wvb1YzVEUr\nYUE5ZkZXWkdRYXk0ZnE3YXVKNWdUaGsKaz3aAsi1J4/A/2CWIpYpa+mXjlnmreUZ\nkhxF8FB7YWAyKtlunu/IfhmO2eNX4yB4jixCcGSrOaBjiIsvHEmRPw==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1eq0e6uhjj2tja8v338tkdz8ema2aw5anpuyaq2uru7rt4lq7msyqqut6m2", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlNktTT3FTSzFRWjhxN0xt\ncklXZmRITDkzaDRtaCtmOWxYWlkrcUlIclNJCjVjeDd0Q3l2ZVRwM2duV3p6Wk5r\nOU9ZNnZ3SVQyTHJDb2FVVW5lQnNiTk0KLS0tIDZvOWROODZGUmw0RUh4YXowTnA0\nTHhyTFo1elZUU1JOVDczd1BGZ2lqZXMKrnwColUqyXHwMwT8hRD0yOzqKu0CINJN\n9ileAN3OTZfjEbfj8Ay9QNEG6ZyytWvsuoC71CsD6W8A7goURgeDZA==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age109qksyjgdnf7elnk98dh4vtxt0epju7xjemlqng0j0x75st5zg9qm9h3hy", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrYVJiUTdGQnBrRG5PeFAy\nc2tQOGEwRG94LzJ3ZG5FczdRT1ZQU1pockNBCklMeGh1N0lkY2VkNVVxaXV6THJW\nVlhMS1M2U29qRHgxc1JBWFlnbWNpMjgKLS0tIExzOGVyeS9Qd3A4VzVWWERZZTJj\nSDNiUXh0SFh5TzhYcXl0cDFWMGJVWUUKgeik/hYj3WgmqEh2+Rw4GSHsX3ZnipOm\nuVpoBGcy5S45i6nzA7NVFH2cWUyxuSx6pzRftEEDI4/p+rJoo9K5gQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKMGFEN3A0dnQ0a0JkU3hv\nUzRmVE1UZDlITnFEeXlpdG11cnpNUWo1K3pNCnlUcTdMSDQrNEVBOUV5WEZiVmp2\nSXlMMHlDL1dCWnZpNWZrSkNjN1k3d2sKLS0tIE9mSy84N3U5blhkQUFuemt5UzhQ\ndTVsVktvSlN5OGRGWHpKMzZxOXVWb0kK1ZzqmeYTfCqGcn+2M9oFUh2YS2ZifHdZ\nhw979F23r4W5eUxiKfhuXClZDXMR1wjOPFvP/vk65s6tIapNE52W9Q==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1p3dl7q5ahjdhl3g72mqk9pxy3gcptw9dqmg6syq9f9s03ppqp4rsqm93n2", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzSWttMm9oNDREYUduMVRP\nMVdKclhieG5SK01JcUF6STkzcmx3SDJxamhjCmJSdm9YSjduMnNKNlVhQlRDbzVi\nK0I1dE4zbmNHajZvVFRRcGNaOWY2UVUKLS0tIG9WKzZKQm5ob0VUVjRQdWIwd3Iy\neEpJQWxTOFdLTnhHV2dwUTMxam9WdTAKC6SFo+qZRHedKKg/nK5E3qO+nMQgYOiJ\nnw4HqD81zXrLbzoPCPfrfcqnFMFFAlPVoWMvG8UTO2YxOJlLjsRaQw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQdGt2bmt3elQ2d25OSzVZ\nbWc0RGxVN01KWHhxUkk5YXNQbkNIZkQzOXc4Cm5TOER5L0RmbmhSRzMzVERabTdw\nMDJYZWxTUjJJTG9vOFAxNjVtcE9wbUUKLS0tIEdrLzN2TkhDNkhISE1jeWtySUNx\nSG9BWXg4ei9aSXRubTdHWWVSVmZFNUEKqr5uZ0Da1GKHE/ITP2cHFsLNf6p54Vxd\neE/aubkHsWBH7LvfRbx9n3HUbTIKX769k8JQzRtZVcsCGFSTJDlb0A==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2024-02-17T16:32:53Z", diff --git a/targets/nixos-wiki.nixos.org/secrets/secrets.yaml b/targets/nixos-wiki.nixos.org/secrets/secrets.yaml index 21baa2e..23cc750 100644 --- a/targets/nixos-wiki.nixos.org/secrets/secrets.yaml +++ b/targets/nixos-wiki.nixos.org/secrets/secrets.yaml @@ -11,38 +11,29 @@ sops: - recipient: age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5bTM3cDN5clprd0JENXpB - RmJHYm8zak8xa21LYVhTS2VTVTg5akRyb3lnCnpPU05KTHhtVG9hMlYyMDhIbzd1 - NkpOck5SUTNJZkdNUFVyb2x3RGdYQkUKLS0tIGRORUVXWHNDZXF0bmtHaDlqZHU4 - UWJ2Z2VLSDBXQXBmaW4zeWU2NUt1Q1UKbb0V/aQ0gukeN/F+nDVzAQI79X7bNZtQ - Cy8JZh8+NCXx9IYDQHbsvVsq//M69UO1WJjqiAIOa/LUOtytcJ3FOw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJaXBJT0VHb2p2YmlZUi9n + NGJJZ2E2V1Q0bGdSVVFCOGlWSFpUblR1RDM4CmRiMTdFSXh5YW9PRDVuY2VVKzg3 + czArTnRvaVNLRFBxcXVMdVlCT1h1ckkKLS0tIDBQNVhBdm1DVFZZK3EvVTlSYXNP + RWdtU2c5VzZMRDBYMWtQSkxaVjR1dFUKfmXTFZANe01r9DYuzDxFBE5cUG5G+FDO + QLhMAQ1gRo0Aqa+YD7fhk73uFQo7jysED2QMRvKkpk57wrbdE/SpRA== -----END AGE ENCRYPTED FILE----- - recipient: age1eq0e6uhjj2tja8v338tkdz8ema2aw5anpuyaq2uru7rt4lq7msyqqut6m2 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3NXdnRUtWQWFWWGJuUzZS - ZGdPRGw5Qms3Mjh5N05aREFNWFloOWF4QTBrCnBIY2RDaTd0TE5ydTMyQzU5bitn - eWI3OHZLTWhRWThJVjVGcElLN3lWS2sKLS0tIFVPSWVrTXBib3M0OThhV2x0eXJF - TFgyV01iWk5RQXQzLzlna1NEd1MwWncKiZHoBrCZq2qfZIm+jbsv14QTvD5owODz - bLnTzQ7O3TIEsyuNXlpIeNjTZXEcSmRj981WScxTYvEwy9vcJq/6+w== - -----END AGE ENCRYPTED FILE----- - - recipient: age109qksyjgdnf7elnk98dh4vtxt0epju7xjemlqng0j0x75st5zg9qm9h3hy - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQdUVSNGdTcDQycEpvMkVz - VlJlZkZ2M043azhMa3o4U1hxOGcvbUxEejN3CnAvN0ZuUDJtRzVGMHNteDVaY0Jr - UTJyVjlKNFFETlFWbU80R0YxREF1Y2MKLS0tIFVwUFo0RHU1TEJuQ1RNY2pXZnUz - VjlCN2NnQnIzcHpvU0IwQmgwWFprYTgKaWBhrnch+ufylR4a0Lhc+fB8D2Q/NJ6p - bpxZK0wwlOgv7ZB0l9x4sJUq9gRpLYTinx0Rr2C/SlkOOIEzx0TbJA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIbG9oZ3E2VE9PaHQyemZO + bTdwdkp1dDJXZWpNK3VOd1U4b2IzOUlHZVNNCnBBdk9FRWtIcXRSQzl0dDZZbnRD + dVl1dDI4ZXVYT3JBVWtTOE9vYVBlRVUKLS0tIEFUWWFaU3BKb2tCeHYxc1IzSEhM + U1g0ZnYzWU1pUXNvVWp2UkRnU2xISkkKrnk4x8fpHeRGhCh2VzG9Se6Ka6+/iBrW + BdPVtT97nWIW7viVO7zioYXdnWp3m2JUbu9BF9bc9AdP6Lxz4mEMGA== -----END AGE ENCRYPTED FILE----- - recipient: age1p3dl7q5ahjdhl3g72mqk9pxy3gcptw9dqmg6syq9f9s03ppqp4rsqm93n2 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwcFFiMklwQW9nQlpqUjNW - cDc3Z2tVUVBzWTNlcFJ4YkZzcmw4NzZDU1JZClRmQmdGaElCWTRuSCtsZVpjTUk0 - SFNRY0FGeEx6NkxlWHNtTWxQUzlKajQKLS0tIExCUXFXMWZTVk1CTHVxUzBhYmM0 - NzdoVWR3TlBrZHYzYzBKelc0UTRvbUkK6O1Lpi6hcMHyFA3E8yJO+1LkXR/10xnW - ViKILGcsw4AdsRGNL5fHxQECR11WsEARetpX5GlixC0lvS/Til8YWA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmV05Tdndqcnc3bk8wbSt0 + M09nTFpLN05QMGhGSW5YU0o3Y2xIV3p4SkdrCk90VUFHK2x3bXk5ZGFFdCtCR1Z1 + YnZwTndOck5HTmpWcTlqYm5yTU9wVjQKLS0tIGM3UUFtek5TTkI1bFdNbzMrYUxi + N3daQU9HZXNpblpRYW43TmNXN3RFMVUKudJWBDpnk2ImA5f1VtuupUJU7bFTm8P/ + kkQItnpA1nPGzVUUpHuN/31YqKTnKs/tW1V+IArR/Dl/4eo9tATmLg== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-03-06T19:07:50Z" mac: ENC[AES256_GCM,data:I8eH+R1DREziItvmEO+/vNM0NdR7Aq9Ob6AeyJ47JDabfkDM0ihwO8uz/WMHVyQ0FSwVDXj29VzcQZyYCEi6YIz6LV0sMbuOOC8Na26/O4GQ5rHIPD1J2li+qsKDNOgLfkyNZFUJXqXkrbX8hwiytM+Hda+xAYqfQGN/2S3jipM=,iv:wGP41trqYl9nYHYOKu4bPANnA+lsuDsxq78Qq8io70M=,tag:3f9sH171Dxys5fNphTgjbg==,type:str]