diff --git a/.env b/.env index 4deaf67..56fcd35 100644 --- a/.env +++ b/.env @@ -8,6 +8,7 @@ POSTGRES_DB=peertube #PEERTUBE_DB_SUFFIX=_prod PEERTUBE_DB_USERNAME=peertube PEERTUBE_DB_PASSWORD=peertube +PEERTUBE_DB_SSL=false # Default to Postgres service name "postgres" in docker-compose.yml PEERTUBE_DB_HOSTNAME=postgres @@ -18,7 +19,7 @@ PEERTUBE_WEBSERVER_HOSTNAME=motibus.hexe.net #PEERTUBE_WEBSERVER_HTTPS=false # If you need more than one IP as trust_proxy # pass them as a comma separated array: -PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.16.0.0/12"] +PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.54.0.0/16"] # E-mail configuration # If you use a Custom SMTP server diff --git a/docker-compose.yml b/docker-compose.yml index 6e8f776..7af91f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ --- -version: '3.7' +version: '3.9' services: # You can comment this webserver section if you want to use another webserver/proxy @@ -16,7 +16,7 @@ services: expose: - '80' networks: - - default + - motibus-link - planet-link volumes: - type: bind @@ -37,7 +37,7 @@ services: build: context: ./images/peertube networks: - default: + motibus-link: ipv4_address: 172.54.0.42 env_file: - .env @@ -62,12 +62,16 @@ services: volumes: - ./volume/db:/var/lib/postgresql/data restart: "always" + networks: + - motibus-link redis: image: redis:6-alpine volumes: - ./volume/redis:/data restart: "always" + networks: + - motibus-link postfix: image: mwader/postfix-relay @@ -76,14 +80,16 @@ services: volumes: - ./volume/opendkim/keys:/etc/opendkim/keys restart: "always" + networks: + - motibus-link networks: -networks: - default: + motibus-link: + external: false ipam: driver: default config: - - subnet: 172.54.0.0/16 + - subnet: 172.54.0.0/16 planet-link: external: name: planet-link diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile index 875963d..818886c 100644 --- a/images/nginx/Dockerfile +++ b/images/nginx/Dockerfile @@ -3,6 +3,7 @@ FROM nginx:alpine COPY ./entrypoint.nginx.sh . RUN chmod +x entrypoint.nginx.sh -EXPOSE 80 443 +EXPOSE 80 + ENTRYPOINT [] CMD ["/bin/sh", "entrypoint.nginx.sh"] diff --git a/images/nginx/peertube.conf b/images/nginx/peertube.conf index 2cc3a42..819c7c5 100644 --- a/images/nginx/peertube.conf +++ b/images/nginx/peertube.conf @@ -1,3 +1,5 @@ +# https://raw.githubusercontent.com/Chocobozzz/PeerTube/develop/support/nginx/peertube + # Minimum Nginx version required: 1.13.0 (released Apr 25, 2017) # Please check your Nginx installation features the following modules via 'nginx -V': # STANDARD HTTP MODULES: Core, Proxy, Rewrite, Access, Gzip, Headers, HTTP/2, Log, Real IP, SSL, Thread Pool, Upstream, AIO Multithreading. @@ -54,6 +56,13 @@ server { try_files /dev/null @api; } + location = /api/v1/videos/upload-resumable { + client_max_body_size 0; + proxy_request_buffering off; + + try_files /dev/null @api; + } + location = /api/v1/videos/upload { limit_except POST HEAD { deny all; } diff --git a/images/peertube/src b/images/peertube/src index 9514bb3..86dc0b9 160000 --- a/images/peertube/src +++ b/images/peertube/src @@ -1 +1 @@ -Subproject commit 9514bb3bc0534c2a8c5ffefac013a1b8d3717c0a +Subproject commit 86dc0b9cc9374cba7548bb613ff43d92f90570a8