modules.services.rsshub: update

2026-01-12 04:39:23 +08:00 · 2025-01-23 18:59:03 +08:00
parent 62e5fc9c2e
commit 968f0f2b15
5 changed files with 72 additions and 80 deletions
--- a/devices/vps7/default.nix
+++ b/devices/vps7/default.nix
@@ -34,7 +34,7 @@ inputs:
      services =
      {
        sshd = {};
-        rsshub.enable = true;
+        rsshub = {};
        misskey.instances =
          { misskey.hostname = "xn--s8w913fdga.chn.moe"; misskey-old = { port = 9727; redis.port = 3546; }; };
        synapse.instances =
@@ -48,7 +48,7 @@ inputs:
        nextcloud = {};
        freshrss.enable = true;
        send = {};
-        huginn.enable = true;
+        huginn = {};
        fz-new-order = {};
        httpapi.enable = true;
        gitea = { enable = true; ssh = {}; };
--- a/devices/vps7/secrets.yaml
+++ b/devices/vps7/secrets.yaml
@@ -32,6 +32,7 @@ rsshub:
    youtube-refresh-token: ENC[AES256_GCM,data:pnXQ1euCdix2H7IxudmUUcpxc2OUhciKT8OcGV89c/EpoXHgx1+eLxwY5rRszroWwjge9M001RGHngvD/ny3phfWAwYmIzMJxun2f7JCPe7ybMesWmPSkiqVBss1Zfic1uB8mNM/yw==,iv:8p8/vATY8F3YuGA1TtjekiuaKOMnQyTMjrwDBJaK4VU=,tag:/jVg9FDOuLMNrupgrywpBQ==,type:str]
    twitter-auth-token: ENC[AES256_GCM,data:65SbHggbYtfSfaaxJxRgD6+HpOX4vIfjnVZmOAZ9illPMYOu9MIchQ==,iv:49UuC8n6AGj1skuHzQX39Q/QuKlB9IxogIfiiy1GBnw=,tag:Rq6b0H9UFVZ19tU8ZeelRg==,type:str]
    bilibili-cookie: ENC[AES256_GCM,data:58nO7ADu2oH/OgLJNYrEEzhf1J0zt8EpuygnSANkGXJju5oSmtM7WLnaMEjC96q14OTTA9QLiFVsbxiFY1eUnraA5W7g7+6CYRXVRZaxz91D/dhKzHGTMjB/LynnNqEIc6liONlcHbyjZNQ+WIqPtjVpCKMN7Mi8cv81/cFX/1GqAwncgDD2oXh1hMPOVY4dYcGKuOG0GjlY6RgOgTPqU3HawQjnoWQjPF+lq2rnWD5HP9ZTxOYa7hm2GgPrxkq1fkRrq+kKYeDh+6M7VLDcm5Fpf+biq6F8fZWzmw4NlVZT9BG0vJFa,iv:vxYXg9Yg9qIWFQXtwTYa4Ds0KSxZYg3M6xdtXKbdaig=,tag:TzCPehk9w+BL4wwgDc1CPg==,type:str]
+    zhihu-cookies: ENC[AES256_GCM,data:DgpvRB7IuRe1KuPFqhCbtyFrC02AUlaA9UWS+d8ix0nweItXwZrkqC03lXQY7nJr54H3SfKXNhtUp4nJmV2hqNQOqekrXVsKrG++UmcAr5Ciw1lTmilqM220igJ9YwiHxtsZrWgp4sTPlTTQIFu5xrGnvlSntBjXAjzStTk1R4XRmLV427QuKbNNQ5MjPXS1PYrtN0d4/qXLx74pNd9ZsNd9F4V0E75Zt6vKE8F7aA==,iv:5Lu/HD8Iw655pg84eFs2eEQS68QqA99uMBHlgelZvrI=,tag:Pnd7VWIAgNt+1vo+vyWDpQ==,type:str]
 mail:
    bot: ENC[AES256_GCM,data:j4Y5oYeVt0sd2z2Qwuqisw==,iv:wasQCTqEMAyttbn1zm9oKck6QiByom+F7ZIMDUse9Gc=,tag:92O4ka6f0I9qnlnVy2dltA==,type:str]
 synapse:
@@ -129,8 +130,8 @@ sops:
            SnFHS1Z0SXUzTFdEd29KTy9DU3Y3R0UKfhh+rUmWDrf+UGjclP57dHipPLFoXSqy
            HdelmfV6q4/c7ppx2E+oZw3VNgoZCsrxxzYZfwxHJiZb+5vkE0D8iA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-01-19T03:03:26Z"
-    mac: ENC[AES256_GCM,data:Y2V6OGImOqv25o+VMCtdYbD/VWXdyQLq2K0EjKk2hbalKPAK0qnU4NOEDl9Em+39Jxo6LYlDUyXHLNOWo77QGjgztR2pp+xaZmd9g2zRxMXZLiv3khLUX6tIEpI1b1EdgQ2id2D21YxU+89D9Jwxlp6Dd5bcHa4GxPplstha2jw=,iv:deYb0CZ6kaK8epuRQ/jW8flGYlrIHhCfJbF7E6Iw19A=,tag:ZAf4yRhyxoK/SYS0ApRivg==,type:str]
+    lastmodified: "2025-01-23T10:58:56Z"
+    mac: ENC[AES256_GCM,data:P5aX7UBert1B7o+g3p1ZAVUrGF1JRwUfAp2JZCC7gVkHIQYyuIcP5bGl3mS7nQq5cimUKib58hYfV9+EqHhYFGS/umPhS8bE6K1QnjapT8rBFHIPsu7kEgPx/TCrJVC5aT9+6/+lPtHplzV4TJDfl7vEn/WTcwJmA0NnYxmpgrE=,iv:w7mCAMWA/G1rYX+MeIS9PxJGjyaj6zxAcJ1b44pJA7E=,tag:tVs32HcJh04VMOGmH6Xr7Q==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.9.2
--- a/flake.lock
+++ b/flake.lock
@@ -1279,11 +1279,11 @@
    "rsshub": {
      "flake": false,
      "locked": {
-        "lastModified": 1734135595,
-        "narHash": "sha256-D0mAiHuAFLMBZvBzspbqAlqXXdhYG45fhrYVkCdmA48=",
+        "lastModified": 1737621586,
+        "narHash": "sha256-3rlojj//tAVCdPz9NkkgsSQqxe9478ExOL1LyH4spPM=",
        "owner": "DIYgod",
        "repo": "RSSHub",
-        "rev": "3a8d34ee3f8cc38907296e74e923754297e249d4",
+        "rev": "62a61e5e7945d539bf89175c96bac2b4ab148bba",
        "type": "github"
      },
      "original": {
--- a/flake/src.nix
+++ b/flake/src.nix
@@ -36,7 +36,7 @@
      sha256 = "18gsw2850ig1mg4spp39i0ygfcwx0lqnamysn5whiax22m8d5z67";
    };
  };
-  huginn = inputs.pkgs.dockerTools.pullImage
+  huginn = pkgs.dockerTools.pullImage
  {
    imageName = "ghcr.io/huginn/huginn";
    imageDigest = "sha256:fdaa76b95534f3c3a799d527821681dd61b8b6fc24de0a7e109fc665b627f115";
--- a/modules/services/rsshub.nix
+++ b/modules/services/rsshub.nix
@@ -1,82 +1,73 @@
 inputs:
 {
-  options.nixos.services.rsshub = let inherit (inputs.lib) mkOption types; in
+  options.nixos.services.rsshub = let inherit (inputs.lib) mkOption types; in mkOption
  {
-    enable = mkOption { type = types.bool; default = false; };
-    port = mkOption { type = types.ints.unsigned; default = 5221; };
-    hostname = mkOption { type = types.nonEmptyStr; default = "rsshub.chn.moe"; };
-  };
-  config =
-    let
-      inherit (inputs.config.nixos.services) rsshub;
-      inherit (inputs.lib) mkIf;
-      inherit (builtins) map listToAttrs toString;
-    in mkIf rsshub.enable
+    type = types.nullOr (types.submodule { options =
    {
-      systemd =
+      hostname = mkOption { type = types.nonEmptyStr; default = "rsshub.chn.moe"; };
+    };});
+    default = null;
+  };
+  config = let inherit (inputs.config.nixos.services) rsshub; in inputs.lib.mkIf (rsshub != null)
+  {
+    systemd =
+    {
+      services.rsshub =
      {
-        services.rsshub =
+        description = "rsshub";
+        after = [ "network.target" "redis-rsshub.service" ];
+        requires = [ "redis-rsshub.service" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig =
        {
-          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" ];
-          };
-          restartTriggers = [ inputs.config.sops.templates."rsshub/env".content ];
-        };
-        tmpfiles.rules = [ "d /var/cache/rsshub 0700 rsshub rsshub" ];
-      };
-      sops =
-      {
-        templates."rsshub/env".content =
-          let
-            placeholder = inputs.config.sops.placeholder;
-            redis = inputs.config.nixos.services.redis.instances.rsshub;
-          in
-          ''
-            PORT=${toString rsshub.port}
-            CACHE_TYPE=redis
-            REDIS_URL='redis://:${placeholder."redis/rsshub"}@127.0.0.1:${toString redis.port}'
-            PIXIV_REFRESHTOKEN='${placeholder."rsshub/pixiv-refreshtoken"}'
-            YOUTUBE_KEY='${placeholder."rsshub/youtube-key"}'
-            YOUTUBE_CLIENT_ID='${placeholder."rsshub/youtube-client-id"}'
-            YOUTUBE_CLIENT_SECRET='${placeholder."rsshub/youtube-client-secret"}'
-            YOUTUBE_REFRESH_TOKEN='${placeholder."rsshub/youtube-refresh-token"}'
-            TWITTER_AUTH_TOKEN='${placeholder."rsshub/twitter-auth-token"}'
-            XDG_CONFIG_HOME='/var/cache/rsshub/chromium'
-            XDG_CACHE_HOME='/var/cache/rsshub/chromium'
-            BILIBILI_COOKIE_data0='${placeholder."rsshub/bilibili-cookie"}'
-          '';
-        secrets = (listToAttrs (map (secret: { name = "rsshub/${secret}"; value = {}; })
-        [
-          "pixiv-refreshtoken"
-          "youtube-key" "youtube-client-id" "youtube-client-secret" "youtube-refresh-token"
-          "twitter-auth-token"
-          "bilibili-cookie"
-        ]));
-      };
-      users =
-      {
-        users.rsshub = { uid = inputs.config.nixos.user.uid.rsshub; group = "rsshub"; isSystemUser = true; };
-        groups.rsshub.gid = inputs.config.nixos.user.gid.rsshub;
-      };
-      nixos.services =
-      {
-        redis.instances.rsshub.port = 7116;
-        nginx =
-        {
-          enable = true;
-          https.${rsshub.hostname}.location."/".proxy.upstream = "http://127.0.0.1:${toString rsshub.port}";
+          User = "rsshub";
+          Group = "rsshub";
+          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" ];
        };
+        restartTriggers = [ inputs.config.sops.templates."rsshub/env".content ];
      };
+      tmpfiles.rules = [ "d /var/cache/rsshub 0700 rsshub rsshub" ];
    };
+    sops =
+    {
+      templates."rsshub/env".content = let placeholder = inputs.config.sops.placeholder; in
+      ''
+        PORT=5221
+        CACHE_TYPE=redis
+        REDIS_URL='redis://:${placeholder."redis/rsshub"}@127.0.0.1:7116'
+        PIXIV_REFRESHTOKEN='${placeholder."rsshub/pixiv-refreshtoken"}'
+        YOUTUBE_KEY='${placeholder."rsshub/youtube-key"}'
+        YOUTUBE_CLIENT_ID='${placeholder."rsshub/youtube-client-id"}'
+        YOUTUBE_CLIENT_SECRET='${placeholder."rsshub/youtube-client-secret"}'
+        YOUTUBE_REFRESH_TOKEN='${placeholder."rsshub/youtube-refresh-token"}'
+        TWITTER_AUTH_TOKEN='${placeholder."rsshub/twitter-auth-token"}'
+        ZHIHU_COOKIES='${placeholder."rsshub/zhihu-cookies"}'
+        XDG_CONFIG_HOME='/var/cache/rsshub/chromium'
+        XDG_CACHE_HOME='/var/cache/rsshub/chromium'
+        BILIBILI_COOKIE_data0='${placeholder."rsshub/bilibili-cookie"}'
+      '';
+      secrets = (builtins.listToAttrs (builtins.map (secret: { name = "rsshub/${secret}"; value = {}; })
+      [
+        "pixiv-refreshtoken"
+        "youtube-key" "youtube-client-id" "youtube-client-secret" "youtube-refresh-token"
+        "twitter-auth-token"
+        "bilibili-cookie"
+        "zhihu-cookies"
+      ]));
+    };
+    users =
+    {
+      users.rsshub = { uid = inputs.config.nixos.user.uid.rsshub; group = "rsshub"; isSystemUser = true; };
+      groups.rsshub.gid = inputs.config.nixos.user.gid.rsshub;
+    };
+    nixos.services =
+    {
+      redis.instances.rsshub.port = 7116;
+      nginx = { enable = true; https.${rsshub.hostname}.location."/".proxy.upstream = "http://127.0.0.1:5221"; };
+    };
+  };
 }