Skip to content
This repository has been archived by the owner on Jul 15, 2021. It is now read-only.

Commit

Permalink
upgraded to 3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ledyba committed May 31, 2021
1 parent 524847d commit df5156b
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
18 changes: 12 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,7 +16,7 @@ services:
expose:
- '80'
networks:
- default
- motibus-link
- planet-link
volumes:
- type: bind
Expand All @@ -37,7 +37,7 @@ services:
build:
context: ./images/peertube
networks:
default:
motibus-link:
ipv4_address: 172.54.0.42
env_file:
- .env
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion images/nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
9 changes: 9 additions & 0 deletions images/nginx/peertube.conf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion images/peertube/src
Submodule src updated 878 files

0 comments on commit df5156b

Please sign in to comment.