修正一些问题,实际部署测试ok
This commit is contained in:
@@ -84,7 +84,7 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "666:443" # 公网走 666,映射到容器内 443
|
- "666:443" # 公网走 666,映射到容器内 443
|
||||||
volumes:
|
volumes:
|
||||||
- ./Caddyfile:/etc/caddy/Caddyfile:ro
|
- ./caddyfile.txt:/etc/caddy/Caddyfile:ro
|
||||||
- ./caddy_data:/data
|
- ./caddy_data:/data
|
||||||
- ./caddy_config:/config
|
- ./caddy_config:/config
|
||||||
networks:
|
networks:
|
||||||
@@ -97,8 +97,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- OBSIDIAN_VERSION=1.12.7
|
- OBSIDIAN_VERSION=1.12.7
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
- WS_ORIGINS=https://ob.example.cc:666 # 改你的域名,注意带端口
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./vaults:/vaults
|
- ./vaults:/vaults
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
@@ -121,7 +120,7 @@ networks:
|
|||||||
- **DDNS 也由 Caddy 承担**,所以整个部署只有 2 个容器
|
- **DDNS 也由 Caddy 承担**,所以整个部署只有 2 个容器
|
||||||
- 666 < 1024 是低端口,常规 Docker(root 守护进程)可直接绑定;用 rootless Docker 的读者需先执行 `sudo sysctl -w net.ipv4.ip_unprivileged_port_start=0`
|
- 666 < 1024 是低端口,常规 Docker(root 守护进程)可直接绑定;用 rootless Docker 的读者需先执行 `sudo sysctl -w net.ipv4.ip_unprivileged_port_start=0`
|
||||||
|
|
||||||
### 4. 写 Caddyfile:证书 + DDNS + 密码,一次配好
|
### 4. 写 caddyfile.txt:证书 + DDNS + 密码,一次配好
|
||||||
|
|
||||||
把域名、密码哈希、DNS Token 换成你自己的:
|
把域名、密码哈希、DNS Token 换成你自己的:
|
||||||
|
|
||||||
@@ -153,7 +152,9 @@ networks:
|
|||||||
example.cc ob
|
example.cc ob
|
||||||
}
|
}
|
||||||
versions ipv4
|
versions ipv4
|
||||||
ip_source simple_http https://api.ipify.org
|
# 获取公网 IP 的方式,可以使用多个作为备份
|
||||||
|
ip_source simple_http https://myip.ipip.net
|
||||||
|
ip_source simple_http https://ip.3322.net
|
||||||
}
|
}
|
||||||
|
|
||||||
storage file_system /data/cert
|
storage file_system /data/cert
|
||||||
@@ -166,7 +167,8 @@ ob.example.cc {
|
|||||||
reverse_proxy ignis:8080
|
reverse_proxy ignis:8080
|
||||||
|
|
||||||
basic_auth {
|
basic_auth {
|
||||||
admin $2a$14$你的密码哈希
|
# Username "Bob", password "hiccup"
|
||||||
|
Bob $2a$14$Zkx19XLiW6VYouLHR5NmfOFU0z2GTNmpkT/5qqR7hx4IjWJPDhjvG
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|||||||
Reference in New Issue
Block a user