From 9399294529219b0eeddb951347915ef1407157e9 Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 3 Jun 2024 14:24:23 +0200 Subject: [PATCH 1/3] hosts/storage-2: Used yt-dlp --- hosts/storage-2/mixcloud.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hosts/storage-2/mixcloud.nix b/hosts/storage-2/mixcloud.nix index 10fada4..caf01d8 100644 --- a/hosts/storage-2/mixcloud.nix +++ b/hosts/storage-2/mixcloud.nix @@ -25,13 +25,11 @@ let Group = "data-mixcloud"; Restart="on-failure"; }; - wants = [ "youtube-dl-prepare.service" ]; - after = [ "youtube-dl-prepare.service" ]; - path = [ pkgs.youtube-dl ]; + path = [ pkgs.yt-dlp ]; script = '' mkdir -p /data/mixcloud/${source}/ cd /data/mixcloud/${source}/ - youtube-dl --ignore-errors --playlist-random --download-archive .already-downloaded.txt --newline -x --audio-format mp3 ${url} + yt-dlp --ignore-errors --playlist-random --download-archive .already-downloaded.txt --newline -x --audio-format mp3 ${url} ''; startAt = "*-*-* 05:05:00"; } From d1f849b41e517466bb834c1d2ec4a4fb4a4f466a Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 3 Jun 2024 21:28:31 +0200 Subject: [PATCH 2/3] hosts/storage-2: Enable backups --- hosts/backup-4/secrets.json | 6 +++--- hosts/clerie-backup/secrets.json | 6 +++--- hosts/storage-2/configuration.nix | 9 +++++++++ hosts/storage-2/secrets.json | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/hosts/backup-4/secrets.json b/hosts/backup-4/secrets.json index 11720d5..db7aa73 100644 --- a/hosts/backup-4/secrets.json +++ b/hosts/backup-4/secrets.json @@ -1,5 +1,5 @@ { - "restic-server-magenta-htpasswd": "ENC[AES256_GCM,data:yqjXswnjPlN0JkK2XUTWZdJdYg7F2ysON7yfS/jgE+aKEHk0DWMcrXDslLCJuBh2KiX8ODKni2J2TL05lv6LUMzkhgk9In9iiXRfZ5nLf04Vo2tgIUGLvBvnu6CDDqaeV/egL4Zq835C3zZFrsQWmrpxO52M7p/6hrESi5qfBU7JtH1S/SWjQabHdxJY//Ma7DNmZCBodV6Ayc0/bhedtB4dRQxmQsqcQBgxJ2TfgnZGw6KFrVsQ8dtD+avA0887JMKxhTrnPAYDaw/aYjKW4nCVeOVcfu/lTIh48nuC1pR5JumLYPkrPh1+xLaYc4Sl4dMbsUKH13qK7Z6jmAzmABx1HmFjC6mpJB9tqO1mWLL3Gsnx9g==,iv:xXMLP5qmNCPHzBY5mQkPBNQ5um+vzBQkxu4goSEY4fA=,tag:Vf7Xlc9XCwBXSwul+Ua4tw==,type:str]", + "restic-server-magenta-htpasswd": "ENC[AES256_GCM,data:QxdmemBB/iuU+fvc2QRRkbOHO5Ef8ZJqfTdFCnlOqKog5krZ2oIpURuttH9YeggJXV2Cr+kJDGI0b9Ca6BtCkOhahfWicTeFhuODJsSyZJqzw36Ba8pX3nIpqoa7StTydK1Dx5chOi2g8oB4895SvWqDa/qP10yDtBQAYURHYfodb9/tiKzfjJAGDlqsR2h+qmdbAkvR3/oAquBO8Nb493G2sixs20XIG85moYv6l0MPnZtWEXhDT8lM5tw0PCgpSfYaUeMWnmFuzFBj3MQSo3zAjGPeOSYVFlbwbLqFWL507z0dlRgzsxMYB1F4OL38nOpO2CP2/VvbidgbQZjKCfiHMJtWLQfzZIfNEhcF8kq2uhhOwRSKN3G7u1/ezzu+9UlUVMV6PY2jjbZHJ79Knu5SJ3KqphygjjIhdHufqI03BP/aJa0QkE/mGg9is3H0myW5rG9ElA1C4stF,iv:1Ue/H48af3ECUZ5GC0hrMMBfOuCZSuX9wOSAd5XG7Fk=,tag:HchM/ZJEDG4pWQdDanC9cA==,type:str]", "wg-monitoring": "ENC[AES256_GCM,data:lCuE2EgUo3ER9NNg1rD24Z4cZS+VZ4KmDojnfCsb/LyBsfyu6uOJ4IVtxOE=,iv:KHRP1pXYXk8Fi23cjUZVUUadu9yWoJ2ddxj2fMJJYE0=,tag:TiFlekXM7WLLHAPlmYbP8w==,type:str]", "sops": { "kms": null, @@ -12,8 +12,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpdFREUEVzb2JFd3hSaG9y\neVA2a2Fodko0OTI4ZGM0NlZxRmNtYmFDY1hVCm9ncXdWYTJlSU1FSG1WdlNBZ3VW\nM2VtRmZiWldzalRsRWJ0UkV1L1hSMkEKLS0tIGVLQU9kQXhZbC9SUW9CS2JnWGlJ\nQ3RoeXVkRXNkUWNaZ0VQOW1hcEJnNjAKHgZ48PERJlfkkh2TyCLl52zUZY674BXW\n4zPtmhZrb4xlExetINrOd4hZtL7S7qn5GnTxhoxvCddeU+JPPsfWoQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-05-04T12:33:24Z", - "mac": "ENC[AES256_GCM,data:FcZ1oeZkVIpFZJ11sfiw0+X5eKy0yF8VG8L4TWqD8i4Y5L0HPTQ/GzQMPxRO2QLEIvf+RZPkE0owoEMt1+azkkY7JiaZB0sacFPqK4GNSjpIXmN+spJAIYGS7RsJiDEHSwVutuhgmdJWv/QL5wAJHgEXglmsOkIIww5x4hQcR/k=,iv:eht5ELd4xIPJD62l5aSqQC3cJZ0+nQa2BjX3htUFWcc=,tag:fOBoVOeHcxFxKezoa3Tx/A==,type:str]", + "lastmodified": "2024-06-03T18:16:25Z", + "mac": "ENC[AES256_GCM,data:hWCI1hWTbbasov9Si0JDI39rUuBOEqrz+qxTKrNN4S/r9Ktofrk46b3rxSQF3+bC03HrbCMLk9/7XkvIFJXQj5pa9I1aG8MuMbgF0Z8Ft/uNdHPUUyLJwo/4aav4zXVpdg7zNtPdwjk66pw7iRO5XBmYgnQlnXotHM6S9s7RzuA=,iv:VJmLD1SImGtreceQP+DofnzOGp3sm12iCzbPsqzw6SI=,tag:aUryi0xUG7sd/EOmqrMQCg==,type:str]", "pgp": [ { "created_at": "2024-05-04T12:30:52Z", diff --git a/hosts/clerie-backup/secrets.json b/hosts/clerie-backup/secrets.json index a4eef5d..e7871d2 100644 --- a/hosts/clerie-backup/secrets.json +++ b/hosts/clerie-backup/secrets.json @@ -1,5 +1,5 @@ { - "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]", + "restic-server-cyan-htpasswd": "ENC[AES256_GCM,data:ZKrEv/bU1X+iO7GLlxsM8HhUy6B2+EXRA8JO2X8E8X5nt8Ydwa+wAqTea3hGyW/QNFrNg/nnAFaVg+VNa6UEqOuF0eg4Nf0LOYTtTpNt4uqDHomfFpvFxDfVCbk4a3fnjnJzk51XnZqeVlvuH2JKg9uD6QzTghTuZfysdGePZdD4WRfY+qHsZg2jREgA26WKsRnD1zU4ZnbRAA1s0Lzf5gG4kFciIzovt0x5MYEiVERFeM+HG1a117EvSlsijPNJVLTaFRLTVOlTOYLKXt4KcRJq9KwoZR/LgEz++rUE4DN5f7iQs+Sb9epH9sV/V06R6AKE5ZFcyi5Y+ipt8B4sWX8PQUeFxNlpljXHro8szGNnLnSxxieg10SEwfIEw+nTGVMHToUpvybzdoI4VPUHZGF+kpqv8ejEzhrKZXyPrd7ZCWGDsTdl8gGSefimpEUR8IwuPqImgu2UU8gT,iv:Y/G/odtZ4enBtNc2Wj7bZjsJ3nur5huYAqlu1PgnWlo=,tag:tg3ut7R2jJd+TVvYHIiTdA==,type:str]", "wg-monitoring": "ENC[AES256_GCM,data:rOpBlDt9K//zlgWo1Bw9IX5jmpLbnit5zi60Ulz8f6tHwqVsKJv5NkxYc9A=,iv:Jlo0QZP6R1CEE20iLa7M/LV/ZX2/33oMv/FzBBo6nvY=,tag:Ttqo7BKd6RuUiMksW6rZnw==,type:str]", "sops": { "kms": null, @@ -12,8 +12,8 @@ "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]", + "lastmodified": "2024-06-03T18:16:18Z", + "mac": "ENC[AES256_GCM,data:kWeyNv82yc6H+FJjhTh8vkuxjZ4YFEqmZbqzZr+pEXxXeMUEGi9hr7cauGDNxnRMgWJz9KG1M4tzUyEK8rfVQWLc+Wcf/5Pjsxn1Zg0yJiJAxVFV7AcvGdKUeQuBKgOT5L+Z5+cFdvq9+CU/0M+6/e8jB6OdQWcuy0emBaCut4U=,iv:3w5arXHKapwwo7kgLtHcKfO+dhH22opVP+fjagize0c=,tag:+cCaX2FUG+5UYqutE9IsAA==,type:str]", "pgp": [ { "created_at": "2024-05-05T12:12:27Z", diff --git a/hosts/storage-2/configuration.nix b/hosts/storage-2/configuration.nix index 457e63f..dddd237 100644 --- a/hosts/storage-2/configuration.nix +++ b/hosts/storage-2/configuration.nix @@ -25,6 +25,15 @@ networking.firewall.allowedTCPPorts = [ 80 443 ]; + clerie.backup = { + enable = true; + jobs.main = { + paths = [ + "/data/firmware" + ]; + }; + }; + clerie.system-auto-upgrade = { allowReboot = true; autoUpgrade = true; diff --git a/hosts/storage-2/secrets.json b/hosts/storage-2/secrets.json index fc59be0..3365455 100644 --- a/hosts/storage-2/secrets.json +++ b/hosts/storage-2/secrets.json @@ -2,6 +2,9 @@ "firmware-htpasswd": "ENC[AES256_GCM,data:ylMqgwtpUNRBatpPqbUI+NB3l5mOHr1SVT5uQg0nP0LRG2oLIFnyYh9eYYVGu5iAA6pxL/7gtRwQNVCvA1JSuGcJ,iv:zO6xNv8MxnslYTCwd3GtWFa+ps1iOF1za9QnpJpOGvc=,tag:CNsFnwvjkWqHc4Bsn1Rynw==,type:str]", "mixcloud-htpasswd": "ENC[AES256_GCM,data:RblDvL92Vm0jsKInl9oKiX5z4VTnAy4tSpmecWp0bNOX338NCDlu297k5Bqw,iv:+d84h4Spmin2w8kHONG3qlIRbaWXSjRlS444FwRXby0=,tag:IbixitLWxScQA+fsnmXWgA==,type:str]", "wg-monitoring": "ENC[AES256_GCM,data:toOPf8RottCJag7I5x59/0ggbORyq1SdcZJfVQw96NbZZ8gaaeYnaSsxq7Q=,iv:clPx1xB04W0RTkudwNXYRLjxCSAB7CCTRRBoNwYQVVc=,tag:2iROztOF91tt3WuZssgr4w==,type:str]", + "clerie-backup-job-main": "ENC[AES256_GCM,data:/XkRgpIDcoseylWb0B/tfwl/arxb8H9XEyf1Gr8VIpObVUkY7Wz6NqgF4B/flZCKvr4C5ZVtvTUXJM+hqQnjg0s=,iv:E9lXyXfSOGpro0KhmELzb7EH7gAmZqRFBqiRvdfDzTg=,tag:kYKT2GHhYhOAi+CiGL5J3g==,type:str]", + "clerie-backup-target-cyan": "ENC[AES256_GCM,data:27lh3VLDzajiYNj3u2lYJ1NyjGbcrNEP/UIuLxjzSDgMxGWEuJ6U5KG4kXfzXzPZrn5wnpYWlEn/8DYlRTq4UNw=,iv:o/h6vbaqpYgXa+bf4vUhQX/hKgj+h58Jha5w80tOF8o=,tag:0SOE4zjN3pN0ztr+9scYrA==,type:str]", + "clerie-backup-target-magenta": "ENC[AES256_GCM,data:IiZaZYCE2jwwot0apNPwA4BiFYkN0WnbfcxMklZWC9LRxV9lJxUrQBW8vMl45VKSEvpNFYsOa3npUUPvqPy9xVI=,iv:YalC4ar1+J68fk6Sp+E8y3Rf87Oss9zREUA4ghWWOxc=,tag:A09OXIlL8N5bHLVyM0sRDQ==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -13,8 +16,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwb2JreUo3VGFkMkZJa3Jv\nVUlNOUsxZElzaGV5bnNHZ0gycnZnTW5WUGtRClR6Tmk4cEg0clA3SUJnQjVCVzdP\nTi9BZUttWmxHYkNPeWtCZkhTd1lEMUEKLS0tIHVpOVc1YXR1VkJCa3pBcWJxdmdB\nR2Q1T0VXMHljb3d3R3lkUEJaT3ErRzAKximuwssNcIW5QAsygUEpUGNtHV9/UeuN\n6CD8OeyTg7QkNhP/lZZctN7cPMXIHaPCnj7tuzH8sRJtZZHM5vBKhg==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-05-02T10:49:41Z", - "mac": "ENC[AES256_GCM,data:9Ru61GXs1b4aOlqDGWjc8yKaLh02zZlld1udCLgtCfBnEQFHsBuR4uZIOIoS4YBpBB6KsX5ocIcJ7581AL0+2wjQ4LfopDO3kVTjxGGtxcbfOahluACH6TLdUIXFLDR+v7dTAA+/rqt6ogtIo2c1Wbu88OR/aSVe9akx8jUhabw=,iv:yNFmyHPq/c83ILDa2igJpu2d0gd8Oyieyjc3k3TTr9Y=,tag:66CHYLcNif1aCzkSs4M/Vg==,type:str]", + "lastmodified": "2024-06-03T18:16:12Z", + "mac": "ENC[AES256_GCM,data:T1C8NRIxkbn77GKfTurd0eT5tuO/dumXlKBFQgbf99yejLhB3XQDb/5leJix6Df68vrTzSy8CWPZPD3i/lZqYxB74rJPue/eS4+CePDqD/fbL/JkoMcGLdCIvSjlrPY9Qa//13ITJU2iippWguHmqW9Wx7xJ+yvLzC9rwg2Q3iQ=,iv:LFsRHp1PR+TgGB20Rpe0v2zc4KtmBsQsjeEqzjSI7Eo=,tag:N0DKKvimDjymwqbzYGXY3Q==,type:str]", "pgp": [ { "created_at": "2024-05-02T10:48:16Z", From c157229bc53d491bcd8b881feb447c2c020d1ccb Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Tue, 4 Jun 2024 03:04:10 +0200 Subject: [PATCH 3/3] Update nixpkgs 2024-06-04-01-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 98091b0..6e4eba0 100644 --- a/flake.lock +++ b/flake.lock @@ -268,11 +268,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": {