From b12d519fd57afeefb8bbe7ef0a0fa144f829f707 Mon Sep 17 00:00:00 2001 From: chn Date: Thu, 29 Aug 2024 11:41:25 +0800 Subject: [PATCH] services.rsshub: fix --- modules/services/rsshub.nix | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/modules/services/rsshub.nix b/modules/services/rsshub.nix index 41452eaa..977917e5 100644 --- a/modules/services/rsshub.nix +++ b/modules/services/rsshub.nix @@ -13,22 +13,26 @@ inputs: inherit (builtins) map listToAttrs toString; in mkIf rsshub.enable { - systemd.services.rsshub = + systemd = { - description = "rsshub"; - after = [ "network.target" "redis-rsshub.service" ]; - requires = [ "redis-rsshub.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = + services.rsshub = { - User = inputs.config.users.users.rsshub.name; - Group = inputs.config.users.users.rsshub.group; - EnvironmentFile = inputs.config.sops.templates."rsshub/env".path; - WorkingDirectory = "${inputs.pkgs.localPackages.rsshub}"; - ExecStart = "${inputs.pkgs.localPackages.rsshub}/bin/rsshub"; - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; - AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + description = "rsshub"; + after = [ "network.target" "redis-rsshub.service" ]; + requires = [ "redis-rsshub.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + { + User = inputs.config.users.users.rsshub.name; + Group = inputs.config.users.users.rsshub.group; + EnvironmentFile = inputs.config.sops.templates."rsshub/env".path; + WorkingDirectory = "${inputs.pkgs.localPackages.rsshub}"; + ExecStart = "${inputs.pkgs.localPackages.rsshub}/bin/rsshub"; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + }; }; + tmpfiles.rules = [ "d /var/cache/rsshub 0700 rsshub rsshub" ]; }; sops = { @@ -46,6 +50,8 @@ inputs: YOUTUBE_CLIENT_ID='${placeholder."rsshub/youtube-client-id"}' YOUTUBE_CLIENT_SECRET='${placeholder."rsshub/youtube-client-secret"}' YOUTUBE_REFRESH_TOKEN='${placeholder."rsshub/youtube-refresh-token"}' + XDG_CONFIG_HOME='/var/cache/rsshub/chromium' + XDG_CACHE_HOME='/var/cache/rsshub/chromium' ''; secrets = (listToAttrs (map (secret: { name = "rsshub/${secret}"; value = {}; }) [