optimize
This commit is contained in:
parent
50321ef411
commit
a184466a42
2
.env
2
.env
|
@ -31,6 +31,8 @@ TTRSS_IMAGE=wangqiru/ttrss
|
|||
TTRSS_VERSION=latest-2021-05-19
|
||||
|
||||
# ------------------------------------- FreshRSS ------------------------------------- #
|
||||
FRESHRSS_X86_VERSION=1.19.1
|
||||
FRESHRSS_ARM_VERSION=1.19.1-arm
|
||||
POSTGRES_DB=freshrss
|
||||
POSTGRES_USER=freshrss
|
||||
EXPOSED_PORT=30001
|
16
README.md
16
README.md
|
@ -47,11 +47,7 @@
|
|||
wget https://raw.githubusercontent.com/stilleshan/rssforever/main/install.sh && chmod +x install.sh && ./install.sh
|
||||
```
|
||||
|
||||
## 注意事项
|
||||
### docker-compose 版本
|
||||
建议将 docker-compose 版本升级到 v2.x.x 以上,建议 v2.2.2 版本.
|
||||
新版 docker-compose 启动的容器名命名格式于老版本不同,使用旧版会导致`Watchtower`无法监控更新镜像.除此之外无其他影响.
|
||||
|
||||
## 使用
|
||||
### TTRSS
|
||||
默认账户: admin
|
||||
默认密码: password
|
||||
|
@ -65,7 +61,15 @@ FreshRSS 首次访问需要设置数据库,选择`PostgreSQL`:
|
|||
|
||||
![snapshot01.jpg](./snapshot01.jpg)
|
||||
|
||||
### 定时更新证书
|
||||
### docker compose 版本
|
||||
建议将 docker compose 版本升级到 v2.x.x 以上,建议 v2.2.2 版本.
|
||||
|
||||
### 更新镜像
|
||||
本项目配置有`Watchtower`来监控部分容器的镜像更新.
|
||||
Nginx / TTRSS / FreshRSS 的版本在`.env`文件中定义,请谨慎修改更新.
|
||||
如需更新,建议先行备份`rssforever`目录,再执行`docker-compose down`停止服务,修改版本号后再次执行`docker-compose up -d`启动服务.
|
||||
|
||||
### 更新证书
|
||||
证书每月`1`日自动更新,请执行以下命令来定时每月重启`nginx`服务刷新证书.也可每月手动执行`docker-compose restart`来重启服务.
|
||||
```shell
|
||||
crontab -e
|
||||
|
|
|
@ -40,5 +40,5 @@ else
|
|||
fi
|
||||
|
||||
cat >/var/spool/cron/crontabs/root <<EOF
|
||||
0 0 10 * * /conf/acme.sh >/dev/null 2>&1
|
||||
0 0 1 * * /conf/acme.sh >/dev/null 2>&1
|
||||
EOF
|
||||
|
|
|
@ -14,7 +14,7 @@ DOMAIN=$(cat /conf/account.conf | awk -F= '{if($1~"DOMAIN")print $2}')
|
|||
DNSAPI=$(cat /conf/account.conf | awk -F= '{if($1~"DNSAPI")print $2}')
|
||||
|
||||
cat >/var/spool/cron/crontabs/root<<EOF
|
||||
0 0 10 * * /conf/acme.sh >/dev/null 2>&1
|
||||
0 0 1 * * /conf/acme.sh >/dev/null 2>&1
|
||||
EOF
|
||||
|
||||
if [ ! -f "/ssl/${DOMAIN}.cer" ] && [ -n "${DOMAIN}" ]; then
|
||||
|
|
|
@ -50,7 +50,7 @@ services:
|
|||
- rssforever
|
||||
|
||||
service.rss:
|
||||
image: freshrss/freshrss:arm
|
||||
image: freshrss/freshrss:${FRESHRSS_ARM_VERSION}
|
||||
# container_name: freshrss-app
|
||||
hostname: freshrss-app
|
||||
restart: unless-stopped
|
||||
|
|
|
@ -50,7 +50,7 @@ services:
|
|||
- rssforever
|
||||
|
||||
service.rss:
|
||||
image: freshrss/freshrss:arm
|
||||
image: freshrss/freshrss:${FRESHRSS_ARM_VERSION}
|
||||
# container_name: freshrss-app
|
||||
hostname: freshrss-app
|
||||
restart: unless-stopped
|
||||
|
|
|
@ -51,7 +51,7 @@ services:
|
|||
- rssforever
|
||||
|
||||
service.rss:
|
||||
image: freshrss/freshrss:arm
|
||||
image: freshrss/freshrss:${FRESHRSS_ARM_VERSION}
|
||||
# container_name: freshrss-app
|
||||
hostname: freshrss-app
|
||||
restart: unless-stopped
|
||||
|
@ -105,7 +105,7 @@ services:
|
|||
- WATCHTOWER_CLEANUP=true
|
||||
- WATCHTOWER_SCHEDULE=0 0 10 * * *
|
||||
restart: always
|
||||
command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1
|
||||
command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1
|
||||
networks:
|
||||
- rssforever
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ services:
|
|||
- rssforever
|
||||
|
||||
service.rss:
|
||||
image: freshrss/freshrss:arm
|
||||
image: freshrss/freshrss:${FRESHRSS_ARM_VERSION}
|
||||
# container_name: freshrss-app
|
||||
hostname: freshrss-app
|
||||
restart: unless-stopped
|
||||
|
@ -105,7 +105,7 @@ services:
|
|||
- WATCHTOWER_CLEANUP=true
|
||||
- WATCHTOWER_SCHEDULE=0 0 10 * * *
|
||||
restart: always
|
||||
command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1
|
||||
command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1
|
||||
networks:
|
||||
- rssforever
|
||||
|
||||
|
|
|
@ -100,7 +100,7 @@ services:
|
|||
- WATCHTOWER_CLEANUP=true
|
||||
- WATCHTOWER_SCHEDULE=0 0 10 * * *
|
||||
restart: always
|
||||
command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1
|
||||
command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1
|
||||
networks:
|
||||
- rssforever
|
||||
|
||||
|
|
|
@ -100,7 +100,7 @@ services:
|
|||
- WATCHTOWER_CLEANUP=true
|
||||
- WATCHTOWER_SCHEDULE=0 0 10 * * *
|
||||
restart: always
|
||||
command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1
|
||||
command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1
|
||||
networks:
|
||||
- rssforever
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ services:
|
|||
- rssforever
|
||||
|
||||
service.rss:
|
||||
image: freshrss/freshrss:latest
|
||||
image: freshrss/freshrss:${FRESHRSS_X86_VERSION}
|
||||
# container_name: freshrss-app
|
||||
hostname: freshrss-app
|
||||
restart: unless-stopped
|
||||
|
|
|
@ -50,7 +50,7 @@ services:
|
|||
- rssforever
|
||||
|
||||
service.rss:
|
||||
image: freshrss/freshrss:latest
|
||||
image: freshrss/freshrss:${FRESHRSS_X86_VERSION}
|
||||
# container_name: freshrss-app
|
||||
hostname: freshrss-app
|
||||
restart: unless-stopped
|
||||
|
|
|
@ -51,7 +51,7 @@ services:
|
|||
- rssforever
|
||||
|
||||
service.rss:
|
||||
image: freshrss/freshrss:latest
|
||||
image: freshrss/freshrss:${FRESHRSS_X86_VERSION}
|
||||
# container_name: freshrss-app
|
||||
hostname: freshrss-app
|
||||
restart: unless-stopped
|
||||
|
@ -114,7 +114,7 @@ services:
|
|||
- WATCHTOWER_CLEANUP=true
|
||||
- WATCHTOWER_SCHEDULE=0 0 10 * * *
|
||||
restart: always
|
||||
command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1
|
||||
command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1
|
||||
networks:
|
||||
- rssforever
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ services:
|
|||
- rssforever
|
||||
|
||||
service.rss:
|
||||
image: freshrss/freshrss:latest
|
||||
image: freshrss/freshrss:${FRESHRSS_X86_VERSION}
|
||||
# container_name: freshrss-app
|
||||
hostname: freshrss-app
|
||||
restart: unless-stopped
|
||||
|
@ -114,7 +114,7 @@ services:
|
|||
- WATCHTOWER_CLEANUP=true
|
||||
- WATCHTOWER_SCHEDULE=0 0 10 * * *
|
||||
restart: always
|
||||
command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1
|
||||
command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1
|
||||
networks:
|
||||
- rssforever
|
||||
|
||||
|
|
|
@ -125,6 +125,6 @@ services:
|
|||
- WATCHTOWER_CLEANUP=true
|
||||
- WATCHTOWER_SCHEDULE=0 0 10 * * *
|
||||
restart: always
|
||||
command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1
|
||||
command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1
|
||||
networks:
|
||||
- rssforever
|
||||
|
|
|
@ -125,7 +125,7 @@ services:
|
|||
- WATCHTOWER_CLEANUP=true
|
||||
- WATCHTOWER_SCHEDULE=0 0 10 * * *
|
||||
restart: always
|
||||
command: rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1 rssforever_acme-1
|
||||
command: rssforever_acme-1 rssforever_watchtower_1 rssforever_rsshub_1 rssforever_redis_1 rssforever_browserless_1 rssforever_acme_1 rssforever-watchtower-1 rssforever_rsshub-1 rssforever_redis-1 rssforever_browserless-1
|
||||
networks:
|
||||
- rssforever
|
||||
|
||||
|
|
24
install.sh
24
install.sh
|
@ -42,18 +42,18 @@ welcome (){
|
|||
check_env (){
|
||||
echo -e "${Green}=========================================================================================${Font}"
|
||||
echo -e "${Green}开始检查服务器环境${Font}"
|
||||
# if ! type docker >/dev/null 2>&1 ; then
|
||||
# echo -e "${Red}当前系统 docker 未安装,已退出脚本.${Font}"
|
||||
# exit 0
|
||||
# fi
|
||||
# if ! type docker-compose >/dev/null 2>&1 ; then
|
||||
# echo -e "${Red}当前系统 docker-compose 未安装,已退出脚本.${Font}"
|
||||
# exit 0
|
||||
# fi
|
||||
# if ! type git >/dev/null 2>&1 ; then
|
||||
# echo -e "${Red}当前系统 git 未安装,已退出脚本.${Font}"
|
||||
# exit 0
|
||||
# fi
|
||||
if ! type docker >/dev/null 2>&1 ; then
|
||||
echo -e "${Red}当前系统 docker 未安装,已退出脚本.${Font}"
|
||||
exit 0
|
||||
fi
|
||||
if ! type docker-compose >/dev/null 2>&1 ; then
|
||||
echo -e "${Red}当前系统 docker-compose 未安装,已退出脚本.${Font}"
|
||||
exit 0
|
||||
fi
|
||||
if ! type git >/dev/null 2>&1 ; then
|
||||
echo -e "${Red}当前系统 git 未安装,已退出脚本.${Font}"
|
||||
exit 0
|
||||
fi
|
||||
if [ -d "${WORK_PATH}/rssforever" ] ; then
|
||||
echo -e "${Red}当前目录存在 rssforever 项目.请更换目录,或删除后再次执行脚本.${Font}"
|
||||
exit 0
|
||||
|
|
Loading…
Reference in New Issue