Fix caddyfile and improvements.

This commit is contained in:
FireMasterK 2021-08-25 01:58:41 +05:30
parent d32b534d24
commit 33a9c65b0b
No known key found for this signature in database
GPG key ID: 49451E4482CC5BCD
3 changed files with 9 additions and 9 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
config/ config/
data/

View file

@ -15,7 +15,7 @@ services:
image: 1337kavin/piped:latest image: 1337kavin/piped:latest
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./config/config.properties:/app/config.properties - ./config/config.properties:/app/config.properties:ro
depends_on: depends_on:
- ytproxy - ytproxy
- postgres - postgres
@ -24,8 +24,10 @@ services:
image: varnish:6.6-alpine image: varnish:6.6-alpine
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./config/default.vcl:/etc/varnish/default.vcl - ./config/default.vcl:/etc/varnish/default.vcl:ro
container_name: varnish container_name: varnish
depends_on:
- piped
caddy: caddy:
image: caddy:2-alpine image: caddy:2-alpine
restart: unless-stopped restart: unless-stopped
@ -33,9 +35,8 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
volumes: volumes:
- ./config/Caddyfile:/etc/caddy/Caddyfile - ./config/Caddyfile:/etc/caddy/Caddyfile:ro
- caddy_data:/data - caddy_data:/data
- caddy_config:/config
- ytproxy:/var/run/ytproxy - ytproxy:/var/run/ytproxy
container_name: caddy container_name: caddy
postgres: postgres:
@ -61,5 +62,4 @@ services:
command: piped-frontend piped-backend ytproxy varnish caddy postgres watchtower command: piped-frontend piped-backend ytproxy varnish caddy postgres watchtower
volumes: volumes:
caddy_data: caddy_data:
caddy_config:
ytproxy: ytproxy:

View file

@ -9,9 +9,6 @@ BACKEND_HOSTNAME {
PROXY_HOSTNAME { PROXY_HOSTNAME {
header_upstream -CF-Connecting-IP
header_upstream -X-Forwarded-For
@ytproxy path /videoplayback* /api/v4/* /api/manifest/* @ytproxy path /videoplayback* /api/v4/* /api/manifest/*
@optionscall { @optionscall {
@ -29,12 +26,14 @@ PROXY_HOSTNAME {
header / { header / {
Cache-Control "public, max-age=604800" Cache-Control "public, max-age=604800"
-Access-Control-Allow-Origin
} }
respond @optionscall 200 respond @optionscall 200
reverse_proxy unix//var/run/ytproxy/http-proxy.sock { reverse_proxy unix//var/run/ytproxy/http-proxy.sock {
header_up -CF-Connecting-IP
header_up -X-Forwarded-For
header_down -Access-Control-Allow-Origin
header_down -etag header_down -etag
header_down -alt-svc header_down -alt-svc
} }