Skip to content

Commit

Permalink
Merge pull request #153 from monlor:test
Browse files Browse the repository at this point in the history
feat: 🎸 设置webdav密码后自动开启强制登陆
monlor authored Jun 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents dfef04c + 1511fff commit b9f9ff5
Showing 10 changed files with 30 additions and 35 deletions.
23 changes: 10 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -23,13 +23,14 @@

* 所有脚本集成到 Docker 镜像,避免污染系统环境
* 合并jellyfin和emby的x86和arm镜像,部署时无需区分镜像名
* 集成云盘清理脚本到alist服务,无需单独部署
* 通过环境变量配置阿里云盘token,无需映射文件
* jellyfin和emby启动时自动进行依赖检查,等待元数据下载完成,自动添加hosts
* 完全兼容所有能运行docker的x86和arm设备
* 支持自动清理阿里云盘,自动同步小雅元数据
* 自动更新内部的alist,emby,jellyfin访问地址,无需手动配置
* 通过metadata服务自动更新emby配置和元数据
* 自动清理阿里云盘,默认每10分钟一次
* 自动更新小雅alist中的云盘数据,默认每天一次
* 自动更新emby服务配置,默认每周一次
* 自动更新emby媒体数据,默认每天一次
* 支持小雅夸克网盘资源,挂载自定义夸克网盘资源
* 支持小雅PikPak网盘资源,挂载自定义PikPak资源
* 支持小雅阿里云盘资源,挂载自定义阿里云盘资源
* 支持WebDav,TvBox服务

## 提问规则

@@ -174,9 +175,9 @@ docker run -d --name alist \
-e ALIYUN_TOKEN=阿里云盘TOKEN \
-e ALIYUN_OPEN_TOKEN=阿里云盘Open Token \
-e ALIYUN_FOLDER_ID=阿里云盘文件夹ID \
-e QUARK_COOKIE=夸克网盘cookie \
-e AUTO_UPDATE_ENABLED=true \
-e AUTO_CLEAR_ENABLED=true \
-e EMBY_ADDR=http://emby:6908 \
--network=xiaoya \
ghcr.io/monlor/xiaoya-alist
```
@@ -189,8 +190,6 @@ docker run -d --name metadata \
-e EMBY_ENABLED=true \
-e JELLYFIN_ENABLED=false \
-e AUTO_UPDATE_EMBY_CONFIG_ENABLED=true \
-e ALIST_ADDR=http://alist:5678 \
-e EMBY_ADDR=http://emby:6908 \
-v xiaoya:/etc/xiaoya \
-v media:/media/xiaoya \
-v config:/media/config \
@@ -207,8 +206,6 @@ docker run -d --name emby
-e TZ=Asia/Shanghai \
-e GIDLIST=0 \
-e ALIST_ADDR=http://alist:5678 \
--privileged \
--device /dev/dri:/dev/dri \
-v media:/media \
-v config:/config \
-v cache:/cache \
@@ -227,7 +224,7 @@ docker logs emby

## 安全建议

* 开启alist的登陆,alist服务设置`FORCE_LOGIN=true`,设置webdav的密码`WEBDAV_PASSWORD`
* 开启alist的登陆,alist服务设置webdav的密码`WEBDAV_PASSWORD`
* 在emby控制台修改ApiKey,这个key需要配置到metadata和alist服务,变量名:`EMBY_APIKEY`

## 赞助
2 changes: 2 additions & 0 deletions alist/Dockerfile
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ FROM xiaoyaliu/alist:hostmode

LABEL MAINTAINER [email protected]

ENV TZ=Asia/Shanghai

EXPOSE 5678 2345 2346

VOLUME /data
6 changes: 2 additions & 4 deletions alist/README.md
Original file line number Diff line number Diff line change
@@ -38,8 +38,6 @@ docker run -d -p 5678:80 -p 2345:2345 -p 2346:2346 --restart=unless-stopped --na

`PROXY`: 使用代理,支持http、https、socks5协议,格式:http://ip:7890 或 socks5://ip:7890

`FORCE_LOGIN`: 开启登陆功能,true/false

`WEBDAV_PASSWORD`: webdav用户名为dav,设置密码。默认用户密码:guest/guest_Api789

`EMBY_ADDR`: emby部署地址,默认http://emby:6908,容器内部使用地址,一般不用改
@@ -52,6 +50,6 @@ docker run -d -p 5678:80 -p 2345:2345 -p 2346:2346 --restart=unless-stopped --na

`AUTO_CLEAR_ENABLED`: 自动清理阿里云云盘的文件,true/false,默认false

`AUTO_CLEAR_INTERVAL`: 自动清理间隔,单位分钟,默认10分钟
`AUTO_CLEAR_INTERVAL`: 自动清理间隔,单位分钟,范围0-60分钟,默认10分钟

`AUTO_CLEAR_THRESHOLD`: 阿里云盘自动清理文件存在时间阈值,单位分钟,默认10分钟
`AUTO_CLEAR_THRESHOLD`: 阿里云盘自动清理文件存在时间阈值,单位分钟,范围0-60分钟,默认10分钟
17 changes: 6 additions & 11 deletions alist/start.sh
Original file line number Diff line number Diff line change
@@ -137,23 +137,18 @@ else
rm -rf /data/proxy.txt
fi

# 开启强制登陆
if [ "${FORCE_LOGIN:=false}" = "true" ]; then
echo "已开启强制登陆..."
if [ ! -f /data/guestlogin.txt ]; then
touch /data/guestlogin.txt
fi
else
echo "已关闭强制登陆..."
rm -rf /data/guestlogin.txt
fi

# 设置webdav密码
if [ -n "${WEBDAV_PASSWORD:-}" ]; then
echo "设置webdav密码..."
# 设置webdav密码后自动开启强制登陆
echo "${WEBDAV_PASSWORD}" > /data/guestpass.txt
if [ ! -f /data/guestlogin.txt ]; then
touch /data/guestlogin.txt
fi
else
rm -rf /data/guestpass.txt
# 关闭强制登陆
rm -rf /data/guestlogin.txt
fi

# 设置数据下载目录
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@ services=(
)

if [ -z "$service" ]; then
for service in ${services[@]}; do
docker build -t monlor/xiaoya-$service $service
for service in "${services[@]}"; do
docker build -t "monlor/xiaoya-$service" "$service"
done
else
docker build -t monlor/xiaoya-$service $service
docker build -t "monlor/xiaoya-$service" "$service"
fi

2 changes: 2 additions & 0 deletions emby/Dockerfile
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ FROM ${BASE_IMAGE}

LABEL MAINTAINER [email protected]

ENV TZ=Asia/Shanghai

ARG TARGETARCH

ENV SHELL2HTTP_VERSION="1.17.0" \
4 changes: 1 addition & 3 deletions env
Original file line number Diff line number Diff line change
@@ -11,14 +11,12 @@ QUARK_COOKIE=
AUTO_UPDATE_ENABLED=true
# 自动清理阿里云盘
AUTO_CLEAR_ENABLED=true
# 阿里云盘自动清理间隔,单位分钟,默认10分钟
# 阿里云盘自动清理间隔,单位分钟,范围0-60分钟,默认10分钟
AUTO_CLEAR_INTERVAL=
# pikpak 账号,用来观看小雅中pikpak分享给你的资源,格式:`[email protected]:aaadds`
PIKPAK_USER=
# 开启tvbox随机订阅地址,true/false,默认false
TVBOX_SECURITY=
# 开启登陆功能,true/false,默认false
FORCE_LOGIN=
# webdav用户名为dav,设置密码。默认用户密码:guest/guest_Api789
WEBDAV_PASSWORD=

1 change: 0 additions & 1 deletion helmfile.yaml
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@ releases:
ALIYUN_FOLDER_ID:
AUTO_UPDATE_ENABLED: true
AUTO_CLEAR_ENABLED: true
FORCE_LOGIN: false
WEBDAV_PASSWORD:
volumes:
- name: data
2 changes: 2 additions & 0 deletions jellyfin/Dockerfile
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ FROM ${BASE_IMAGE}

LABEL MAINTAINER [email protected]

ENV TZ=Asia/Shanghai

# 更新软件包索引、安装 ping 命令并清理缓存
RUN apt-get update \
&& apt-get install -y iputils-ping \
2 changes: 2 additions & 0 deletions metadata/Dockerfile
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ FROM xiaoyaliu/glue:latest

LABEL MAINTAINER [email protected]

ENV TZ=Asia/Shanghai

WORKDIR /media

# 设置非交互模式,以避免安装过程中提示用户输入

0 comments on commit b9f9ff5

Please sign in to comment.