stilleshan
/
rssforever
mirror of https://github.com/stilleshan/rssforever.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix docker networks

This commit is contained in:
Stille 2022-01-06 14:47:59 +08:00
parent 1a105e53c7
commit 9f22058ed1
5 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose_files/arm/freshrss-http.yml
View File

@ -46,6 +46,8 @@ services:
POSTGRES_USER: ${POSTGRES_USER:-freshrss} POSTGRES_USER: ${POSTGRES_USER:-freshrss}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-freshrss} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-freshrss}
POSTGRES_DB: ${POSTGRES_DB:-freshrss} POSTGRES_DB: ${POSTGRES_DB:-freshrss}
networks:
- rssforever
service.rss: service.rss:
image: freshrss/freshrss:arm image: freshrss/freshrss:arm
@ -60,4 +62,6 @@ services:
environment: environment:
CRON_MIN: '*/20' CRON_MIN: '*/20'
TZ: Asia/Shanghai TZ: Asia/Shanghai
networks:
- rssforever

4
compose_files/arm/freshrss-https.yml
View File

@ -46,6 +46,8 @@ services:
POSTGRES_USER: ${POSTGRES_USER:-freshrss} POSTGRES_USER: ${POSTGRES_USER:-freshrss}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-freshrss} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-freshrss}
POSTGRES_DB: ${POSTGRES_DB:-freshrss} POSTGRES_DB: ${POSTGRES_DB:-freshrss}
networks:
- rssforever
service.rss: service.rss:
image: freshrss/freshrss:arm image: freshrss/freshrss:arm
@ -60,6 +62,8 @@ services:
environment: environment:
CRON_MIN: '*/20' CRON_MIN: '*/20'
TZ: Asia/Shanghai TZ: Asia/Shanghai
networks:
- rssforever
# ---------------------------------------- acme.sh ---------------------------------------- # # ---------------------------------------- acme.sh ---------------------------------------- #
acme: acme:

4
compose_files/arm/freshrss-rsshub-http.yml
View File

@ -47,6 +47,8 @@ services:
POSTGRES_USER: ${POSTGRES_USER:-freshrss} POSTGRES_USER: ${POSTGRES_USER:-freshrss}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-freshrss} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-freshrss}
POSTGRES_DB: ${POSTGRES_DB:-freshrss} POSTGRES_DB: ${POSTGRES_DB:-freshrss}
networks:
- rssforever
service.rss: service.rss:
image: freshrss/freshrss:arm image: freshrss/freshrss:arm
@ -61,6 +63,8 @@ services:
environment: environment:
CRON_MIN: '*/20' CRON_MIN: '*/20'
TZ: Asia/Shanghai TZ: Asia/Shanghai
networks:
- rssforever
# ---------------------------------------- rsshub ---------------------------------------- # # ---------------------------------------- rsshub ---------------------------------------- #

4
compose_files/arm/freshrss-rsshub-https.yml
View File

@ -47,6 +47,8 @@ services:
POSTGRES_USER: ${POSTGRES_USER:-freshrss} POSTGRES_USER: ${POSTGRES_USER:-freshrss}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-freshrss} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-freshrss}
POSTGRES_DB: ${POSTGRES_DB:-freshrss} POSTGRES_DB: ${POSTGRES_DB:-freshrss}
networks:
- rssforever
service.rss: service.rss:
image: freshrss/freshrss:arm image: freshrss/freshrss:arm
@ -61,6 +63,8 @@ services:
environment: environment:
CRON_MIN: '*/20' CRON_MIN: '*/20'
TZ: Asia/Shanghai TZ: Asia/Shanghai
networks:
- rssforever
# ---------------------------------------- rsshub ---------------------------------------- # # ---------------------------------------- rsshub ---------------------------------------- #

2
install.sh
View File

@ -222,7 +222,7 @@ get_acme_info () {
echo -e "${Green}=========================================================================================${Font}" echo -e "${Green}=========================================================================================${Font}"
echo -e "${Red}注意: Cloudflare API 有三种:${Font}" echo -e "${Red}注意: Cloudflare API 有三种:${Font}"
echo -e "${Red}请参考 https://github.com/acmesh-official/acme.sh/wiki/dnsapi#1-cloudflare-option 选择.${Font}" echo -e "${Red}请参考 https://github.com/acmesh-official/acme.sh/wiki/dnsapi#1-cloudflare-option 选择.${Font}"
echo -e "${Red}推荐使用第二种: 可参考 https://ssl.ioiox.com/dnsapi.html 获取:${Font}" echo -e "${Green}推荐使用第二种: 可参考 https://ssl.ioiox.com/dnsapi.html 获取.${Font}"
echo "1) Using the global API key" echo "1) Using the global API key"
echo "2) Using the new cloudflare api token" echo "2) Using the new cloudflare api token"
echo "3) Using the new cloudflare api token for Single Zone" echo "3) Using the new cloudflare api token for Single Zone"