Merge branch 'peertube' of Dryusdan/Dockerfiles into master

peertube/Dockerfile

@@ -13,6 +13,13 @@ ENV UID=991 GID=991 \
 	TRANSCODING_ENABLE=false \
 	TRANSCODING_THREADS=2 \
 	BODY_SIZE=100M \
+	CACHE_SIZE=100 \
+	SIGNUP_LIMIT=10 \
+	RESOLUTION_280=true \
+	RESOLUTION_360=true \
+	RESOLUTION_480=true \
+	RESOLUTION_720=true \
+	RESOLUTION_1080=true \
 	DEBIAN_FRONTEND=noninteractive
 
 

peertube/rootfs/PeerTube/config/production.yaml

@@ -23,16 +23,27 @@ storage:
   previews: 'previews/'
   thumbnails: 'thumbnails/'
   torrents: 'torrents/'
+  
+cache:
+  previews:
+    size: <cache_size>
 
 admin:
   email: '<admin_email>'
 
 signup:
   enabled: <signup_enabled>
+  limit: <signup_limit> # When the limit is reached, registrations are disabled. -1 == unlimited
 
 # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
 # Uses a lot of CPU!
 transcoding:
   enabled: <transcoding_enable>
   threads: <transcoding_threads>
+  resolutions: # Only created if the original video has a higher resolution
+    240p: <resolution_280>
+    360p: <resolution_360>
+    480p: <resolution_480>
+    720p: <resolution_720>
+    1080p: <resolution_1080>
 

peertube/rootfs/usr/local/bin/startup

@@ -4,16 +4,23 @@
 groupadd -g ${GID} peertube && useradd -u ${UID} -M -g ${GID} peertube
 
 sed -i -e 's|<https>|'${HTTPS}'|' \
-        -e 's|<hostname>|'${HOSTNAME}'|' \
-        -e 's|<port>|'${PORT}'|' \
-        -e 's|<database_host>|'${DATABASE_HOST}'|' \
-        -e 's|<database_port>|'${DATABASE_PORT}'|' \
-        -e 's|<database_username>|'${DATABASE_USERNAME}'|' \
-        -e 's|<database_password>|'${DATABASE_PASSWORD}'|' \
-        -e 's|<admin_email>|'${ADMIN_EMAIL}'|' \
-        -e 's|<signup_enabled>|'${SIGNUP_ENABLE}'|' \
-        -e 's|<transcoding_enable>|'${TRANSCODING_ENABLE}'|' \
-        -e 's|<transcoding_threads>|'${TRANSCODING_THREADS}'|' /PeerTube/config/production.yaml
+		-e 's|<hostname>|'${HOSTNAME}'|' \
+		-e 's|<port>|'${PORT}'|' \
+		-e 's|<database_host>|'${DATABASE_HOST}'|' \
+		-e 's|<database_port>|'${DATABASE_PORT}'|' \
+		-e 's|<database_username>|'${DATABASE_USERNAME}'|' \
+		-e 's|<database_password>|'${DATABASE_PASSWORD}'|' \
+		-e 's|<admin_email>|'${ADMIN_EMAIL}'|' \
+		-e 's|<signup_enabled>|'${SIGNUP_ENABLE}'|' \
+		-e 's|<transcoding_enable>|'${TRANSCODING_ENABLE}'|' \
+		-e 's|<transcoding_threads>|'${TRANSCODING_THREADS}'|' \
+  		-e 's|<cache_size>|'${CACHE_SIZE}'|' \
+  		-e 's|<signup_limit>|'${SIGNUP_LIMIT}'|' \
+  		-e 's|<resolution_280>|'${RESOLUTION_280}'|' \
+  		-e 's|<resolution_360>|'${RESOLUTION_360}'|' \
+  		-e 's|<resolution_480>|'${RESOLUTION_480}'|' \
+  		-e 's|<resolution_720>|'${RESOLUTION_720}'|' \
+  		-e 's|<resolution_1080>|'${RESOLUTION_1080}'|' /PeerTube/config/production.yaml
 
 sed -i -e 's|<body_size>|'${BODY_SIZE}'|' /etc/nginx/sites-enabled/peertube.conf