diff --git a/apps/rsshub/config.json b/apps/rsshub/config.json index e602e699..01afa34e 100644 --- a/apps/rsshub/config.json +++ b/apps/rsshub/config.json @@ -1,7 +1,7 @@ { "name": "RSSHub", "available": true, - "port": 8220, + "port": 8223, "exposable": true, "id": "rsshub", "description": "RSSHub is an open source, easy to use, and extensible RSS feed generator. It's capable of generating RSS feeds from pretty much everything.", @@ -22,5 +22,6 @@ "required": false, "env_variable": "ACCESS_KEY" } - ] + ], + "supported_architectures": ["amd64", "arm64"] } diff --git a/apps/rsshub/data/app.env b/apps/rsshub/data/app.env index 3b27c726..84bee255 100644 --- a/apps/rsshub/data/app.env +++ b/apps/rsshub/data/app.env @@ -30,7 +30,7 @@ CACHE_TYPE="redis" #CACHE_REQUEST_TIMEOUT=60 #CACHE_EXPIRE=300 #CACHE_CONTENT_EXPIRE=3600 -REDIS_URL="redis://redis:6379/" +REDIS_URL="redis://rsshub_redis:6379/" #MEMORY_MAX=256 ################################# @@ -88,7 +88,7 @@ REDIS_URL="redis://redis:6379/" #ENABLE_CLUSTER=false NODE_ENV="production" #NODE_NAME="" -PUPPETEER_WS_ENDPOINT="ws://browserless:3000" +PUPPETEER_WS_ENDPOINT="ws://rsshub_browserless:3000" #CHROMIUM_EXECUTABLE_PATH="" #TITLE_LENGTH_LIMIT=150 #OPENAI_API_KEY="" @@ -328,4 +328,4 @@ PUPPETEER_WS_ENDPOINT="ws://browserless:3000" #ZHIHU_COOKIES="" # ## Zodgame ## -#ZODGAME_COOKIE="" \ No newline at end of file +#ZODGAME_COOKIE="" diff --git a/apps/rsshub/docker-compose.yml b/apps/rsshub/docker-compose.yml index cfe0325f..aef67f5b 100644 --- a/apps/rsshub/docker-compose.yml +++ b/apps/rsshub/docker-compose.yml @@ -1,63 +1,61 @@ -version: '3.9' - services: - rsshub: - image: diygod/rsshub:2024-04-17 - container_name: rsshub_main - restart: unless-stopped - ports: - - ${APP_PORT}:1200 - environment: - TZ: ${TZ} - env_file: - - /app-data/rsshub/data/app.env - networks: - - tipi_main_network - depends_on: - - redis - - browserless - labels: - # Main - traefik.enable: true - traefik.http.middlewares.rss-web-redirect.redirectscheme.scheme: https - traefik.http.services.rsshub.loadbalancer.server.port: 1200 - # Web - traefik.http.routers.rss-insecure.rule: Host(`${APP_DOMAIN}`) - traefik.http.routers.rss-insecure.entrypoints: web - traefik.http.routers.rss-insecure.service: rsshub - traefik.http.routers.rss-insecure.middlewares: rss-web-redirect - # Websecure - traefik.http.routers.rss.rule: Host(`${APP_DOMAIN}`) - traefik.http.routers.rss.entrypoints: websecure - traefik.http.routers.rss.service: rsshub - traefik.http.routers.rss.tls.certresolver: myresolver - # Local domain - traefik.http.routers.rss-local-insecure.rule: Host(`rsshub.${LOCAL_DOMAIN}`) - traefik.http.routers.rss-local-insecure.entrypoints: web - traefik.http.routers.rss-local-insecure.service: rsshub - traefik.http.routers.rss-local-insecure.middlewares: rss-web-redirect - # Local domain secure - traefik.http.routers.rss-local.rule: Host(`rsshub.${LOCAL_DOMAIN}`) - traefik.http.routers.rss-local.entrypoints: websecure - traefik.http.routers.rss-local.service: rsshub - traefik.http.routers.rss-local.tls: true + rsshub: + image: diygod/rsshub:2024-04-17 + container_name: rsshub + restart: unless-stopped + ports: + - ${APP_PORT}:1200 + environment: + TZ: ${TZ} + env_file: + - ${APP_DATA_DIR}/data/app.env + networks: + - tipi_main_network + depends_on: + - redis + - browserless + labels: + # Main + traefik.enable: true + traefik.http.middlewares.rsshub-web-redirect.redirectscheme.scheme: https + traefik.http.services.rsshub.loadbalancer.server.port: 1200 + # Web + traefik.http.routers.rsshub-insecure.rule: Host(`${APP_DOMAIN}`) + traefik.http.routers.rsshub-insecure.entrypoints: web + traefik.http.routers.rsshub-insecure.service: rsshub + traefik.http.routers.rsshub-insecure.middlewares: rsshub-web-redirect + # Websecure + traefik.http.routers.rsshub.rule: Host(`${APP_DOMAIN}`) + traefik.http.routers.rsshub.entrypoints: websecure + traefik.http.routers.rsshub.service: rsshub + traefik.http.routers.rsshub.tls.certresolver: myresolver + # Local domain + traefik.http.routers.rsshub-local-insecure.rule: Host(`rsshub.${LOCAL_DOMAIN}`) + traefik.http.routers.rsshub-local-insecure.entrypoints: web + traefik.http.routers.rsshub-local-insecure.service: rsshub + traefik.http.routers.rsshub-local-insecure.middlewares: rsshub-web-redirect + # Local domain secure + traefik.http.routers.rsshub-local.rule: Host(`rsshub.${LOCAL_DOMAIN}`) + traefik.http.routers.rsshub-local.entrypoints: websecure + traefik.http.routers.rsshub-local.service: rsshub + traefik.http.routers.rsshub-local.tls: true - browserless: - image: browserless/chrome - container_name: rsshub_browserless - restart: unless-stopped - ulimits: - core: - hard: 0 - soft: 0 - networks: - - tipi_main_network + browserless: + image: browserless/chrome + container_name: rsshub_browserless + restart: unless-stopped + ulimits: + core: + hard: 0 + soft: 0 + networks: + - tipi_main_network - redis: - image: redis:alpine - container_name: rsshub_redis - restart: unless-stopped - volumes: - - ${APP_DATA_DIR}/data/redis:/data - networks: - - tipi_main_network + redis: + image: redis:alpine + container_name: rsshub_redis + restart: unless-stopped + volumes: + - ${APP_DATA_DIR}/data/redis:/data + networks: + - tipi_main_network diff --git a/apps/rsshub/metadata/description.md b/apps/rsshub/metadata/description.md index 015418eb..9ae17905 100644 --- a/apps/rsshub/metadata/description.md +++ b/apps/rsshub/metadata/description.md @@ -1,7 +1,3 @@ -# RSSHub - -![](https://camo.githubusercontent.com/ceaf8f7b5c2b0f5b71013f5553cd4e71dfbc47787928a2ec1cfe0e41a7a0b99c/68747470733a2f2f646f63732e7273736875622e6170702f696d672f6c6f676f2e706e67) - ## Introduction Introduction @@ -14,7 +10,6 @@ RSSHub can be used with browser extension [RSSHub Radar](https://github.com/DIYg [English docs](https://docs.rsshub.app/) | [Telegram Group](https://t.me/rsshub) | [Telegram Channel](https://t.me/awesomeRSSHub) | [Twitter](https://twitter.com/intent/follow?screen_name=_RSSHub) | [中文文档](https://docs.rsshub.app/zh/) - ## Usage In order to generate a feed, a valid URL with parameters has to be appended to the main domain for your RSSHub instance, varying with each different app. More on the how-to's for each supported service or app can be found on [https://docs.rsshub.app/guide/](https://docs.rsshub.app/guide/), and on [https://docs.rsshub.app/guide/parameters](https://docs.rsshub.app/guide/parameters) for filtering/sorting/limiting your feed in a given URL. @@ -29,7 +24,7 @@ More info related to available configuration envvars for RSSHub can be found on RSSHub provides an access control feature for restricting which user generates a feed within your instance. This can be enabled with the envvar `ACCESS_KEY`, which can be configured either at the installation step through Runtipi's App Store or via the envvars at `docker-compose.yml` or `app.env` for the RSSHub app. Default value is empty (`""`), which means no extra key is required in order to access a feed through the URLs. -Note that `ACCESS_KEY` is enabled **globally**, but access can be controlled granularly on an app-by-app basis by only giving the specific app *access code* to a user, as explained through the diagram found on [https://docs.rsshub.app/deploy/config#access-control-configurations](https://docs.rsshub.app/deploy/config#access-control-configurations). +Note that `ACCESS_KEY` is enabled **globally**, but access can be controlled granularly on an app-by-app basis by only giving the specific app _access code_ to a user, as explained through the diagram found on [https://docs.rsshub.app/deploy/config#access-control-configurations](https://docs.rsshub.app/deploy/config#access-control-configurations). ``` + -----------------------------------------------------------------------------------------------------------------+ diff --git a/apps/rsshub/metadata/logo.jpg b/apps/rsshub/metadata/logo.jpg index 2ba142fe..ad9fc464 100644 Binary files a/apps/rsshub/metadata/logo.jpg and b/apps/rsshub/metadata/logo.jpg differ