Update from updated-inputs-2024-05-06-01-03

flake.lock

@@ -283,11 +283,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1714635257,
+        "lastModified": 1714906307,
-        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
+        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
+        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
         "type": "github"
       },
       "original": {

hosts/clerie-backup/restic-server.nix

@@ -10,9 +10,8 @@
 
   # restic rest server does not support --htpasswd-file in the current version of nixpkgs
   # until then we copy the secrets to the common location
-  age.secrets.restic-server-cyan-htpasswd = {
+  sops.secrets.restic-server-cyan-htpasswd = {
     path = "/mnt/clerie-backup/cyan/.htpasswd";
-    symlink = false;
     owner = "restic";
     group = "restic";
   };

hosts/clerie-backup/secrets.json

@@ -0,0 +1,27 @@
+{
+	"restic-server-cyan-htpasswd": "ENC[AES256_GCM,data:hZwaiVUPYfsozW8hWXt28e+3ECFVWLrtqrob2P5Aul7UzXDO8yEYd1XEHz6CYxO8kFbYnPfviT7nktkEDrG6Ak7PBxWCmoFARN6x6o/sNTE/XwcEE3fXdRGRPyccwYR7m6cp0PjtRBUdDxhTiSb0Q8jgdDNWvPzm/hHZ3lh0Xz8LUPV56cemL9vAIe+t3l4+DHQOlBhI+MWE6d62yCtJ/maV5BmxlnO/ytlLjO9eLyBMgdJrI54QmtPdUVgnE4OZ5xbX2UhLtOYE8WrHSPNEq2Btozn7YGI5Bw5ELmunTeXb3ealDCCwAzwuvWZbDuAr5nF2DoItd1uH+qX6kFvJ+eIkB5DauMii/ls1U0fJi0aEIVeyrQ==,iv:4+5Mj+9u9DLFTxOpLlT5WsMOqYyCuC6FT1Jq8hQxcsw=,tag:RlkmykrV37eiB2ss5YyDRg==,type:str]",
+	"wg-monitoring": "ENC[AES256_GCM,data:rOpBlDt9K//zlgWo1Bw9IX5jmpLbnit5zi60Ulz8f6tHwqVsKJv5NkxYc9A=,iv:Jlo0QZP6R1CEE20iLa7M/LV/ZX2/33oMv/FzBBo6nvY=,tag:Ttqo7BKd6RuUiMksW6rZnw==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1px682xeu0xfkr49qdqe95er040p2vv3ugekk04e36jj2wqs7tyfs8mhclh",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0UCtUZ3NZQWxOK1FUNDhL\nbWhaanN2OEJIVmpMOURzWU1vcGhuODdtcDJnCm9Nb01NaVVpWDJ6Q3JCbXRkRUJP\nUVdFaGVScUdxRnlpSnRNOG1RalNRaFUKLS0tICs0cW1WR0JMUmdaVWVzdTh2bjFm\nenBzaERpb1hCS1E3TUo3cmxpZFUxWmcKcLL5/YTGyZEVLwHSpbEI5XfWGklkI7h+\n0uhCww8Wh23EpUYFslZ0Nnbf5HX5/Z34qBwf20cvN8eLToTAQvTdeg==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2024-05-05T12:14:00Z",
+		"mac": "ENC[AES256_GCM,data:f340b/muADvVEt9cFg1Y3AxonjpxjQgdq3qyRKkN78b2beuWC1Ih7blEn6XiOTIvb2SODeVR6CzEvjuUt9RiJHvTeY2CY3WOkmJkN5zZrzY1Dv77UUTAwbst+xqzARmUDbNcTZu8ToPjJZitXpC3exeqdL8VE4kyxh655dsk9oU=,iv:EtNhZ28ClcwDpKdpw6hXE8kMocCWnm34WQfC8fXBrNo=,tag:RfRzA6RzH+I65z0Nxs6XMw==,type:str]",
+		"pgp": [
+			{
+				"created_at": "2024-05-05T12:12:27Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\n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\n69m9Y2zRBg==\n=lDcq\n-----END PGP MESSAGE-----",
+				"fp": "0C982F87B7AFBA0F504F90A2629E741947C87928"
+			}
+		],
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.8.1"
+	}
+}

hosts/clerie-backup/secrets/wg-monitoring.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 HwR33w t9osbbi1s3J96OhWrTgrNmGHfIWUAqB4aFvmbNqtTG8
-DD+iNLEd6WBvRS8PC0pfiCgNmVR4jNwBZHcaR8a814Y
--> ssh-ed25519 ILP4Ew sisQcIh1A9M3qwl9yD+cSPNM/nnNpII+Xfesj9mwkRM
-7h/dPRCYHA88Q7lWvvPvdHf4ppCiEnu9ca6TY0BZLzY
--> {9O-grease a_:E
-g5khXWjhnAYGhbvvT8+gbde58hiKZe9UtQfsGUDvnngA+OQulOiV9+tRX+yuzUhb
-0z6nyMS0R9kPFsSFg7H03SYbkKaidh54FCYzyRMLld9nHYe6mUE
---- zDunV7ZXq7wNxXOVAdEUJmeGI25kHpsO2S5qNklhHQ4
-G
T¸$ìä;¥¸&Nn­g=õRÁvóMS¤W·s/ÚÕ›á—nÙðÝkÿÚŒlL&jíG§Ï
ERÐ(_™VB‚vÌÄ^—ˆ&iä£:ÊdÊ

hosts/minecraft-2/secrets.json

@@ -0,0 +1,29 @@
+{
+	"clerie-backup-job-main": "ENC[AES256_GCM,data:WX5QobcSfvQg9d4fbbU79fqIMcFTE+9oSFAnTcbAA7ljZ7OxY42xQzTwEBJaowBT/MZNINDRBYudRtAqIPrsMA==,iv:he613LVfSaBRSTGBBYYefXvLOglstN6Dhvy42VTMa7o=,tag:aWulppIPHE9OwoFH2oAJFw==,type:str]",
+	"clerie-backup-target-cyan": "ENC[AES256_GCM,data:ZfPM0GanKDkKpGcmNb3Hejy0bD3/iLU3ugSiBaifdeALrCF+inANZ203XRdGjYT1Ifzj2EKnIyhurQiMvUAsJQ==,iv:brsD9uybx7kPlv+Oegldfg/a30kgsOBTeE4HxQ7TPAU=,tag:9LAjruOYMqvwe0S2fkxm+w==,type:str]",
+	"clerie-backup-target-magenta": "ENC[AES256_GCM,data:+pwsjMF2s3fgXM7m1df8/MztQH0ZNG0xGr5JEkiwdR1/0l7id+Ie2RamvhmM96SPsO6MSP95vXE0NaTsjbbVqg==,iv:aO6mcnktSgWP9a+o2rDtrmBMhBhj0l3GjSjXDwTf8ns=,tag:fgOaITQSfb7OujlOofeppA==,type:str]",
+	"wg-monitoring": "ENC[AES256_GCM,data:+DKbzWaZpkkrdUVxA0a+ZGfqIsAnbw9fSWlfo0CH5jItDQV9A/NqRFJVtis=,iv:Hncmy+Yu+FqgV374ETC7H0wHSf0sAJDuuRT9f5nu8QA=,tag:Rxi1GyIXLSvcrC5uFoOfHg==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age15aqsntxzd48t036tekumpxj6cgw6t5weplrvk88mfcq4glgc8y5q3kn3hf",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwVkVwRlBIU0pieFp4MDRP\nR2V5Z1ZVNExmYjlhMnljMFYxZ2dkTldQc2owCmxxdWN2UnExZ0FpTmJqMFJ6NlR3\nN2JhV1FXQmFJaGEvUXRnV3VIYnRKTkUKLS0tIFRPaXBjMUpyUWZNTTYzSWNSY01h\nOHUxUDRJMGUvb1FTMHgrWHVYQ1VxVXMKG4IguWm5+5MdoVJtAEr64osunrxk7DGH\nxaGoKINpjaYX8j2045g2BG5nMuhxR1APWFyOtegs2pJY7GsuZNkZww==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2024-05-05T11:27:24Z",
+		"mac": "ENC[AES256_GCM,data:Nwn/7pYXFOmjt2lH/ONFhX8yebh8aRdeyleXFYqUD9T9IkITftka2A4IseUp1u9c4GYAcUeVv/2O3Zwg7QiLw+AGmwypU0OV/tlA2NmlVpOP/yjoHgVpbecQdll972CSjiHouNNhtbMHK/iBEx1WCGjsCc9Nq3pzsnSxTRDihUk=,iv:OWRFa6WHa6ukGeQfLGQMS1BY8FFK/BbQ/SLEwRMgKH4=,tag:BbstVHpXo8PwmqVTE+PKCQ==,type:str]",
+		"pgp": [
+			{
+				"created_at": "2024-05-05T11:26:14Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\n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\nmIjPQR+QYQ==\n=jRJ5\n-----END PGP MESSAGE-----",
+				"fp": "0C982F87B7AFBA0F504F90A2629E741947C87928"
+			}
+		],
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.8.1"
+	}
+}

hosts/minecraft-2/secrets/clerie-backup-job-main.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 HwR33w VOKZmTkEoyrKLAN6uNv+LQHqc4avP8iwH4BiM+VueGM
-G69PUY0KeW5uKCS+v2v3BWtaxWLTVUx3PIztgBVenNE
--> ssh-ed25519 4YRm+g qCBKNpb6kkqKoHMe6oXJL9yRjY5Re8WJUy/Vm6nY5GY
-gRYAzyHROciCgZJQQ8RpxbZ2LMdkvklHfIggLq9J4yk
--> PS60>-grease @iB[%' b&A wKA5$@K
-nSwvNJ6vCt24R7Qok7jLttjUQ+Vx1G2tO1Kw1htdZbYy3GNIl2jnkJtn7NJcA6hM
-9sgcnQVetxr93l/uiwKyIhQTPcuwuLY
---- GVqzFN33Y1T7jgvEqQqQjBMR3VuEnXY51eKmI9/bO8s
-52ßV³f¾žbØsDÜÝ*åFW¢
.:Æû[¹±¶¢è]=&ñ{­ð dS‹êµ 9}Ê#ËRµÖÓ
úˆ×½7‚•o¤†‘<E280A0><E28098>3¨ôQíæ*Ì«;è˜Rý‹ŠM¸ò_–