From 62f1aa90c2410dbabd2db7e1091d8603cec42e2d Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 4 Aug 2025 14:27:34 +0200 Subject: [PATCH 1/5] chore: secrets --- secrets/dandelion/secrets.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/secrets/dandelion/secrets.yaml b/secrets/dandelion/secrets.yaml index 110de11..250086e 100644 --- a/secrets/dandelion/secrets.yaml +++ b/secrets/dandelion/secrets.yaml @@ -1,4 +1,5 @@ systemMailerPassword: ENC[AES256_GCM,data:b9Mmxo3beDpo1pi1Y+5TZn64ZeKJzJXlJwYFs5BjVMngeej+Y0naWmwBdlTEwzPm6OiO/N1haNQUlwT4KdOTx7t8PsZwQ5dOQl1gjWp0T+0ImWLImvINyvDIg6uh9RsvqLIJBvgLAtiUHE3jq7vLwDPaZ69tvjmGACNfNKX8A0A=,iv:BvmZ7GtDsHFWSY+cL10P1e7I75ZwrzjFJ6e5J2IbEic=,tag:g9yqAQtJ9kD3o1cfng0gTA==,type:str] +dandelionSyncthingId: ENC[AES256_GCM,data:YgkjHxSD5mp44MMd7X46Rt5FqW89prMvhrkvHN5dxvPJ937cOGV9WYXf69A0+0XEbO97jlDAp7ph1GF0Q9UV,iv:45gaF2MZh1GbZmvKRnEtkQfNgx11r9xYaxvqAkU2ZkM=,tag:f9Iel/5029acJuzzTmyHXQ==,type:str] sops: age: - recipient: age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w @@ -19,7 +20,7 @@ sops: L1d2bW5tRDhjQ2VaU0xDWWlZYi94TEUKvjD1Pk8/Jq18nCJioeVBYbfaT3rSYr4l aZ+j21bb7tE3JbUQfGkYo2blJqZsxFxblZlvf6tK2DU39Tl64naUpQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-08-01T08:17:35Z" - mac: ENC[AES256_GCM,data:WrMLYUSjwh0MOPPAjGTzLip5I+4LxrQoSreKANsl6xwakMmDKzENgp3kzsZyAqWaX6OgLWh1YrpnN+9z6n3UDi+LGYj1WZwHeZnBCwnuyq9cyAhLdPxcvqp0bcNaZfI04IUPpMTk/8o14gpTsbCYy+eIUc/19golYN2NKr2B03Y=,iv:Np1OeYCWdnun3QlQ8MAPd2TRMFwdx1l3Ca0JffqCv64=,tag:jTLzww9TKQnmkla2PhCR1Q==,type:str] + lastmodified: "2025-08-04T12:19:27Z" + mac: ENC[AES256_GCM,data:5bbqvvcMj3t7quhjgZ5By2vRaz0pOdPSbZaGJ1p6QLEJvynm/9wOPt/8xs4dOYFlXbQ52PlouXVkdp6J8RPLeD/tpDFmMy7QIN1mHdcFQmsiulML43n4gSPV3ZAbJ1hlTjfBHNN5hyXKDzXxMXjTQL+jCeA/7493JVaC/Yv1psw=,iv:0RcZmJT72Ih4JyMby0F0ALkKsN0bXPy1E/7GtpUdgt4=,tag:s6MmfLhGDaIJr0Q0RucZQw==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 From 5adcaba8ecb34401838f83cb2e9d2ad4eb44872e Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 4 Aug 2025 14:27:38 +0200 Subject: [PATCH 2/5] chore: secrets --- secrets/sakura/secrets.yaml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/secrets/sakura/secrets.yaml b/secrets/sakura/secrets.yaml index 0dab49b..f16d281 100644 --- a/secrets/sakura/secrets.yaml +++ b/secrets/sakura/secrets.yaml @@ -1,18 +1,5 @@ systemMailerPassword: ENC[AES256_GCM,data:fdCLxxQOPw00kSGrddcr/ZsYWJ9xYPkfxUeS52jA+MNM4dNNfeQ2rhvWKLYpH/6D3/J7CND0UNUVuRLtPdEnU8ct8jkAmYX5nGDm9HAnVScDvbn5dMvaNxg+0o34Fz7E0XbmRM3B6zpzL4T6Odmmd2iRh/cRiz7WBwmKUpcCV3Q=,iv:ddPxnK6f1wEH+xxQLLADO5SdG8YZkbSVlNfan+AA4vs=,tag:WLrQzVsok6dtxSSQH3HHsw==,type:str] -# -# -# -#ENC[AES256_GCM,data:WflW57V0HPZBinBmThQZxDjILXgY62hOrQLKjp2mElmaHt09pd0SS/qZvYZEyLQ=,iv:1GF427GJB8sZbD4cPYiX6vWXW+g7ITAyXz8dWPqpcvM=,tag:SewPaiwvOXfuYu1boXbEkg==,type:comment] -hello: ENC[AES256_GCM,data:ayluRTSd1xDWGf1K+rMibtj+9fCDy5GMwv0wTDdf1C2hIQeColi6gUdpYTwwZw==,iv:DfG10vFe0HAaCnN8e6ik3QixjhTj2KsDGiwg6XufpBQ=,tag:Y1q3uREa3CXSFZBJMYc6cQ==,type:str] -example_key: ENC[AES256_GCM,data:YdS40bL6x1LmRwg76Q==,iv:5FdtHG3iE50vktShWVdkv9oBrUQoqUesGSvPoaD0j2U=,tag:DDaJXIyozB6N2Cj6Bxk1nA==,type:str] -#ENC[AES256_GCM,data:VMGPI7MXiCSTO9QDlT5DUg==,iv:qkKFWGJKQswSdvetMrn3oD1o3c5nzk1UUDpjlbNnRgY=,tag:ZdP7az9j92eYzfQSqFF5gQ==,type:comment] -example_array: - - ENC[AES256_GCM,data:afMceLch3kcnHzf73Ic=,iv:CQbLPVQVo4QB696Z6J5tgF+1/ZL+9/rKOuGsY8xV1XI=,tag:8yG6JXG9C4KXhiA+AyeSGg==,type:str] - - ENC[AES256_GCM,data:QIa8LkkS1c3AW3T3hbs=,iv:8v20+UPaPnddw8WPJo1tTpf/o7Xi+3cFnwjNOM0UaqQ=,tag:FbWSFLwTcDwBtd+gGeONNg==,type:str] -example_number: ENC[AES256_GCM,data:7ok2x8uHYpAFoQ==,iv:S16WiwAx0OWtuDeuLINJH8xllMGWxzt/3+K5/RNlY5U=,tag:6ytIj66O8rRtTObpmIB/UQ==,type:float] -example_booleans: - - ENC[AES256_GCM,data:Npqj1Q==,iv:uPFu6d24WJVz4N0eOKRSgDgiHYxQoAhPqNRY0dk9rVQ=,tag:V9FEUgx8W707N+q+K63yoA==,type:bool] - - ENC[AES256_GCM,data:J1LcbM8=,iv:TLFH/WyteSCphbR4IlzUr12sUfmCj3mpIeBbBqfNnb4=,tag:YDEJvQB8c8xEeXOupNrYmQ==,type:bool] +dandelionSyncthingId: ENC[AES256_GCM,data:crzT7Ph2gDYm/LAyEM2yw/THzu+Dv5SBrw17NF42j2jCvGMLaDgdlMAhkJlr7bonnpjII+9/TLjEXtcEIhcd,iv:6e94tT8rCLFxwDWLNj2T/Fx+0yAuhfS2AdjAKJKt/k0=,tag:Ai44ZvRZps4lQ4gLBbfUDw==,type:str] sops: age: - recipient: age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w @@ -24,7 +11,7 @@ sops: bjBJd2RtdDhkSFlaUzVRTkQyTVpVSDgKoZ7S/izFqmPw3qHT37ws8m2Cmmb8prC/ JaVn8U57G4aRgp1BqXQvpnKA98HT3BwEsMce5LeNvX7kAtdqkU5eRQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-07-27T23:20:55Z" - mac: ENC[AES256_GCM,data:hKxGeDETPmOxbyXm2zd/wNKY8nmlUGjbBQorV2pmUgFSNGXxkZifwzT5b0E4ZWaxWyO0bqqEH/jRkIwrU46SDN+RAqZBm5iDwFfmV9QPOlUOgfPDFi2Ho8yDlouvjB6FkwJwooGF3uvGs1bM2in9WMCcI+GFiEi5+VOHBmKtx8U=,iv:1gKoMdKhujmvMyAi4cU4av5tkSPY2ykJShMTtK+2Dnk=,tag:AhuWcD9+Gi9UsQXJm/6qEQ==,type:str] + lastmodified: "2025-08-04T12:27:22Z" + mac: ENC[AES256_GCM,data:P5S1Rv3nViY/1L5Ne2eBt0LTkZc59Oz5r07WqitZfqUyW6n11VjRFCAbB4EODZUEemUVR5KgBh1LXoZuhMb16jjTHviFW/ODTliBD9JdddG9CMVTygly49Jr4zscoMGcqZi3zQD/iuKygVxJsBM7LlF8lumyT+wGO2G/3uyeO74=,iv:Q5NOgpkRtBcRJndRZbEFQCn4xoa7yvUNoJFDUTK3xxQ=,tag:sOL1Enx0Cc2tfvwXr1JMyA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 From a21233bcdc9458b026dc81a77ae0e985404998af Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 4 Aug 2025 14:27:47 +0200 Subject: [PATCH 3/5] fix: allow sops to use new location --- .sops.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sops.yaml b/.sops.yaml index ca78916..b08f268 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -3,7 +3,7 @@ keys: - &violet age1zegau3chyn53tqvkwud6tuyggpkazc88pdkqv8cknavaudu49enqm2f0h3 - &dandelion age1dpzajxcx7dcumda55qc3hncxqd43a7k85t2cdwtcvy5qsgp6k5tsugxqmd creation_rules: - - path_regex: secrets/secrets.yaml + - path_regex: secrets/sakura/secrets.yaml key_groups: - age: - *sakura From 32a29ebba0ffe662c40f34fadd464bbedf6526cf Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 4 Aug 2025 14:33:04 +0200 Subject: [PATCH 4/5] chore: secrets --- secrets/dandelion/secrets.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/secrets/dandelion/secrets.yaml b/secrets/dandelion/secrets.yaml index 250086e..1d7791f 100644 --- a/secrets/dandelion/secrets.yaml +++ b/secrets/dandelion/secrets.yaml @@ -1,5 +1,6 @@ systemMailerPassword: ENC[AES256_GCM,data:b9Mmxo3beDpo1pi1Y+5TZn64ZeKJzJXlJwYFs5BjVMngeej+Y0naWmwBdlTEwzPm6OiO/N1haNQUlwT4KdOTx7t8PsZwQ5dOQl1gjWp0T+0ImWLImvINyvDIg6uh9RsvqLIJBvgLAtiUHE3jq7vLwDPaZ69tvjmGACNfNKX8A0A=,iv:BvmZ7GtDsHFWSY+cL10P1e7I75ZwrzjFJ6e5J2IbEic=,tag:g9yqAQtJ9kD3o1cfng0gTA==,type:str] dandelionSyncthingId: ENC[AES256_GCM,data:YgkjHxSD5mp44MMd7X46Rt5FqW89prMvhrkvHN5dxvPJ937cOGV9WYXf69A0+0XEbO97jlDAp7ph1GF0Q9UV,iv:45gaF2MZh1GbZmvKRnEtkQfNgx11r9xYaxvqAkU2ZkM=,tag:f9Iel/5029acJuzzTmyHXQ==,type:str] +sakuraSyncthingId: ENC[AES256_GCM,data:dzMpAy6wzlbGdnsesc7OUB25AkvdRwReT+o1UUqoz1VXXldy5esTpa3vGqM2B/Qa3lZq999VX4hejisSRBGd,iv:Eorc7tX4cnu2n2Kc1uPrfTdU5KQ8jjUsKDuByf1/mts=,tag:+ev+2RbN1v22N96zuQHV9w==,type:str] sops: age: - recipient: age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w @@ -20,7 +21,7 @@ sops: L1d2bW5tRDhjQ2VaU0xDWWlZYi94TEUKvjD1Pk8/Jq18nCJioeVBYbfaT3rSYr4l aZ+j21bb7tE3JbUQfGkYo2blJqZsxFxblZlvf6tK2DU39Tl64naUpQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-08-04T12:19:27Z" - mac: ENC[AES256_GCM,data:5bbqvvcMj3t7quhjgZ5By2vRaz0pOdPSbZaGJ1p6QLEJvynm/9wOPt/8xs4dOYFlXbQ52PlouXVkdp6J8RPLeD/tpDFmMy7QIN1mHdcFQmsiulML43n4gSPV3ZAbJ1hlTjfBHNN5hyXKDzXxMXjTQL+jCeA/7493JVaC/Yv1psw=,iv:0RcZmJT72Ih4JyMby0F0ALkKsN0bXPy1E/7GtpUdgt4=,tag:s6MmfLhGDaIJr0Q0RucZQw==,type:str] + lastmodified: "2025-08-04T12:32:42Z" + mac: ENC[AES256_GCM,data:JrU10DY9ih8eMtR3vNpuGppU4gZQyxAzDZ7R2+UFnv/g0zGVYnIKyVEQB9AfO2PEc+nBIYvruiO8XJrqx9O3osf7gvICXnWgEB8C4VPv7IvgniPz68O0hAgpBKkh7Lj0ZP/EGpjXjMr1yBTLtMWsFBXqJa16cD21qsHnlQjBp9Q=,iv:4LWlyE86dKDgwErqE/PmbquGFyQxUVfZw8bifjSB51I=,tag:95INrs/69ipBIutWb5ZbrA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 From 48ca8a3495bfe9ff3932e9e0fbe1d4cb6684866b Mon Sep 17 00:00:00 2001 From: Ahwx Date: Mon, 4 Aug 2025 14:33:10 +0200 Subject: [PATCH 5/5] chore: secrets --- secrets/sakura/secrets.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/secrets/sakura/secrets.yaml b/secrets/sakura/secrets.yaml index f16d281..b6ee715 100644 --- a/secrets/sakura/secrets.yaml +++ b/secrets/sakura/secrets.yaml @@ -1,5 +1,6 @@ systemMailerPassword: ENC[AES256_GCM,data:fdCLxxQOPw00kSGrddcr/ZsYWJ9xYPkfxUeS52jA+MNM4dNNfeQ2rhvWKLYpH/6D3/J7CND0UNUVuRLtPdEnU8ct8jkAmYX5nGDm9HAnVScDvbn5dMvaNxg+0o34Fz7E0XbmRM3B6zpzL4T6Odmmd2iRh/cRiz7WBwmKUpcCV3Q=,iv:ddPxnK6f1wEH+xxQLLADO5SdG8YZkbSVlNfan+AA4vs=,tag:WLrQzVsok6dtxSSQH3HHsw==,type:str] dandelionSyncthingId: ENC[AES256_GCM,data:crzT7Ph2gDYm/LAyEM2yw/THzu+Dv5SBrw17NF42j2jCvGMLaDgdlMAhkJlr7bonnpjII+9/TLjEXtcEIhcd,iv:6e94tT8rCLFxwDWLNj2T/Fx+0yAuhfS2AdjAKJKt/k0=,tag:Ai44ZvRZps4lQ4gLBbfUDw==,type:str] +sakuraSyncthingId: ENC[AES256_GCM,data:/4MQEcCYVsw2ad2WmUn8Y2f/9mUcyjU9l7Z7PorexQfwaIucmfNH1+Z/FF+0wRj4uaUQLqpR29bRl3EQr/ve,iv:FsiLQYuLZ9YvkfqyF3mAV6jW7csZ5+yXx0sN8f768BE=,tag:U/OTuSnjkOeVT6Vdz96bOw==,type:str] sops: age: - recipient: age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w @@ -11,7 +12,7 @@ sops: bjBJd2RtdDhkSFlaUzVRTkQyTVpVSDgKoZ7S/izFqmPw3qHT37ws8m2Cmmb8prC/ JaVn8U57G4aRgp1BqXQvpnKA98HT3BwEsMce5LeNvX7kAtdqkU5eRQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-08-04T12:27:22Z" - mac: ENC[AES256_GCM,data:P5S1Rv3nViY/1L5Ne2eBt0LTkZc59Oz5r07WqitZfqUyW6n11VjRFCAbB4EODZUEemUVR5KgBh1LXoZuhMb16jjTHviFW/ODTliBD9JdddG9CMVTygly49Jr4zscoMGcqZi3zQD/iuKygVxJsBM7LlF8lumyT+wGO2G/3uyeO74=,iv:Q5NOgpkRtBcRJndRZbEFQCn4xoa7yvUNoJFDUTK3xxQ=,tag:sOL1Enx0Cc2tfvwXr1JMyA==,type:str] + lastmodified: "2025-08-04T12:32:56Z" + mac: ENC[AES256_GCM,data:so7buQVx6nUTRYBfCPdITDccVWOjEmfPslkG8+Z0RKkDgIgwH4Aa/GnTkX0WxmB2bbI6/GQ1PhILE4UXTo8O7W0OO10+PWV2AWwngMcog+ggbH7qpd1395Tw0A8KiiXdPXwxFBEZqrYkKmYVyw314H02+h5+Qd3irH0bWqmpGOg=,iv:Sy4wR3GdSJCR1tlAxV2lau7cpLox/CoiGTC5eZoNVos=,tag:W2pv//unvIE0HBuJ0v35GA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2