diff --git a/rsshub/2024-08-06/data.yml b/rsshub/2024-08-06/data.yml deleted file mode 100644 index bcf3f5208..000000000 --- a/rsshub/2024-08-06/data.yml +++ /dev/null @@ -1,43 +0,0 @@ -additionalProperties: - formFields: - - default: 1200 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelZh: WebUI 端口 - labelEn: WebUI port - required: true - rule: paramPort - type: number - - default: "" - edit: true - envKey: ACCESS_KEY - labelZh: 访问密钥 - labelEn: Access key - required: true - type: text - - default: "memory" - edit: true - envKey: CACHE_TYPE - labelZh: 缓存类型 - labelEn: Cache type - required: true - type: select - values: - - label: 内存 - value: "memory" - - label: Redis - value: "redis" - - default: "redis://127.0.0.1:6379/" - edit: true - envKey: REDIS_URL - labelZh: Redis URL 地址 - labelEn: Redis URL address - required: false - type: text - - default: "" - edit: true - envKey: PROXY_URI - labelZh: 代理 URL 地址 - labelEn: Proxy URL address - required: false - type: text diff --git a/rsshub/2024-08-06/docker-compose.yml b/rsshub/2024-08-06/docker-compose.yml deleted file mode 100644 index 85bcfc1c8..000000000 --- a/rsshub/2024-08-06/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - rsshub: - image: diygod/rsshub:chromium-bundled-2024-08-06 - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:1200 - env_file: - - /etc/1panel/envs/global.env - - ${ENV_FILE:-/etc/1panel/envs/default.env} - environment: - - NODE_ENV=production - - PORT=1200 - - LISTEN_INADDR_ANY=1 - - REQUEST_RETRY=2 - - REQUEST_TIMEOUT=3000 - - ALLOW_ORIGIN=* - - CACHE_CONTENT_EXPIRE=360 - - CACHE_EXPIRE=300 - - MEMORY_MAX=256 diff --git a/rsshub/2024-10-11/data.yml b/rsshub/2024-10-11/data.yml new file mode 100644 index 000000000..2a47d8e4d --- /dev/null +++ b/rsshub/2024-10-11/data.yml @@ -0,0 +1,78 @@ +additionalProperties: + formFields: + - default: 1200 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: ACCESS_KEY + labelZh: 访问密钥 + labelEn: Access key + required: false + type: text + - default: "memory" + edit: true + envKey: CACHE_TYPE + labelZh: 缓存类型 + labelEn: Cache type + required: true + type: select + values: + - label: 内存 + value: "memory" + - label: Redis + value: "redis" + - default: "redis://127.0.0.1:6379/" + edit: true + envKey: REDIS_URL + labelZh: Redis URL 地址 (仅当缓存类型为 Redis 时) + labelEn: Redis URL address (only when the cache type is Redis) + required: false + type: text + - default: 256 + edit: true + envKey: MEMORY_MAX + labelZh: 最大缓存数量 (仅当缓存类型为内存时) + labelEn: Maximum number of caches (only when the cache type is memory) + required: false + type: number + - default: 300 + edit: true + envKey: CACHE_EXPIRE + labelZh: 路由缓存过期时间 (秒) + labelEn: Route cache expiration time (seconds) + required: true + type: number + - default: 300 + edit: true + envKey: CACHE_CONTENT_EXPIRE + labelZh: 内容缓存过期时间 (秒) + labelEn: Content cache expiration time (seconds) + required: true + type: number + - default: "" + edit: true + envKey: PROXY_URI + labelZh: 代理 URL 地址 + labelEn: Proxy URL address + required: false + type: text + - default: "" + edit: true + envKey: PROXY_AUTH + labelZh: 代理认证 (仅支持 Basic 认证) + labelEn: Proxy authentication (only supports Basic authentication) + required: false + type: text + - default: ".*" + edit: true + envKey: PROXY_URL_REGEX + labelZh: 代理 URL 正则表达式 + labelEn: Proxy URL regular expression + required: false + type: text diff --git a/rsshub/2024-10-11/docker-compose.yml b/rsshub/2024-10-11/docker-compose.yml new file mode 100644 index 000000000..c3bd3c624 --- /dev/null +++ b/rsshub/2024-10-11/docker-compose.yml @@ -0,0 +1,61 @@ +networks: + 1panel-network: + external: true + +services: + rsshub: + image: diygod/rsshub:2024-10-11 + container_name: ${CONTAINER_NAME} + depends_on: + - browserless + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:1200 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} + environment: + - NODE_ENV=production + - PUPPETEER_WS_ENDPOINT=ws://browserless:3000 + - PORT=1200 + - LISTEN_INADDR_ANY=1 + - REQUEST_RETRY=2 + - REQUEST_TIMEOUT=3000 + - ALLOW_ORIGIN=* + - CACHE_CONTENT_EXPIRE=360 + - CACHE_EXPIRE=300 + - MEMORY_MAX=256 + - LOGGER_LEVEL=info + - NO_LOGFILES=false + - DISALLOW_ROBOT=true + - ENABLE_CLUSTER=false + - NODE_NAME=rsshub + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:1200/healthz" ] + interval: 30s + timeout: 10s + retries: 3 + + browserless: + image: browserless/chrome + container_name: ${CONTAINER_NAME}-browserless + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + ulimits: + core: + hard: 0 + soft: 0 + expose: + - 3000 + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:3000/pressure" ] + interval: 30s + timeout: 10s + retries: 3 diff --git a/rsshub/2024-08-06/scripts/init.sh b/rsshub/2024-10-11/scripts/init.sh similarity index 100% rename from rsshub/2024-08-06/scripts/init.sh rename to rsshub/2024-10-11/scripts/init.sh diff --git a/rsshub/2024-08-06/scripts/uninstall.sh b/rsshub/2024-10-11/scripts/uninstall.sh similarity index 100% rename from rsshub/2024-08-06/scripts/uninstall.sh rename to rsshub/2024-10-11/scripts/uninstall.sh diff --git a/rsshub/2024-08-06/scripts/upgrade.sh b/rsshub/2024-10-11/scripts/upgrade.sh similarity index 100% rename from rsshub/2024-08-06/scripts/upgrade.sh rename to rsshub/2024-10-11/scripts/upgrade.sh diff --git a/rsshub/README.md b/rsshub/README.md index 6de0afc64..d99b6a8b2 100644 --- a/rsshub/README.md +++ b/rsshub/README.md @@ -12,6 +12,25 @@ 我们建议您使用 Redis 作为缓存数据库,以提高性能。 +> `Redis 缓存地址` 配置 + +如果您想要使用 Redis 作为缓存,请填写对应配置。 + +格式:`redis://username:password@host:port/cache_index` + +示例: + +``` +# 用户名 + 密码模式 +redis://username:password@localhost:6379/0 + +# 密码模式 +redis://:password@localhost:6379/0 + +# 无密码模式 +redis://localhost:6379/0 +``` + ## 使用说明 请参考官方文档:[RssHub 使用说明](https://docs.rsshub.app/zh/guide/) diff --git a/rsshub/data.yml b/rsshub/data.yml index 7150e4cd0..9999ca6cb 100644 --- a/rsshub/data.yml +++ b/rsshub/data.yml @@ -10,7 +10,6 @@ shortDescEn: Generate RSS/Atom/JSON feeds from any content type: website crossVersionUpdate: true - limit: 0 website: https://rsshub.app/ github: https://github.com/DIYgod/RSSHub/ document: https://docs.rsshub.app/