From 13dd6892405f23e0b891085da8488b7acc1dc30c Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 6 Jan 2025 18:38:16 +0100 Subject: [PATCH 1/2] hosts/web-2: Read feeds from different directory --- hosts/web-2/feeds.nix | 3 ++- pkgs/feeds-dir/feeds-dir.sh | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hosts/web-2/feeds.nix b/hosts/web-2/feeds.nix index e684f8d..3ddb2e4 100644 --- a/hosts/web-2/feeds.nix +++ b/hosts/web-2/feeds.nix @@ -9,6 +9,7 @@ users.groups."feeds" = {}; systemd.tmpfiles.rules = [ + "d /data/feeds 0775 root users - -" "d /var/lib/feeds - feeds feeds - -" ]; @@ -31,7 +32,7 @@ User = "feeds"; Group = "feeds"; ExecStart = '' - ${pkgs.feeds-dir}/bin/feeds-dir + ${pkgs.feeds-dir}/bin/feeds-dir /data/feeds ''; }; }; diff --git a/pkgs/feeds-dir/feeds-dir.sh b/pkgs/feeds-dir/feeds-dir.sh index 876c7fb..5b385b6 100755 --- a/pkgs/feeds-dir/feeds-dir.sh +++ b/pkgs/feeds-dir/feeds-dir.sh @@ -2,6 +2,8 @@ set -euo pipefail -for file in ./*.txt; do +IN_DIR="${1:-.}" + +for file in "${IN_DIR}"/*.txt; do rainbowrss --feeds "${file}" --out "$(basename "${file}" ".txt").html" || true done From 92209fd597059eed43d07e0ed84ac7597e07ea22 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Tue, 7 Jan 2025 03:04:03 +0100 Subject: [PATCH 2/2] Update nixpkgs 2025-01-07-02-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d38a6b8..c24ad59 100644 --- a/flake.lock +++ b/flake.lock @@ -542,11 +542,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": {