From 09e6c7fb43fabec66e44f071b2c6ee209a0df866 Mon Sep 17 00:00:00 2001
From: anmol26s <anmol@datamol.org>
Date: Tue, 8 May 2018 04:12:53 +0530
Subject: [PATCH] Updated to v1.0.0-beta.4

---
 conf/app.src         |  4 ++--
 conf/production.yaml | 21 ++++++++++++++++-----
 scripts/backup       |  4 +---
 scripts/install      |  7 +++----
 scripts/remove       |  1 -
 scripts/restore      |  5 ++---
 scripts/upgrade      |  1 -
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index d751cb7..b2928bb 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.0.0-beta.3/peertube-v1.0.0-beta.3.zip
-SOURCE_SUM=6c6714d5229fcfaa5215fedc40e3dd476f39cf7cc62a27ab55e5bb082bd2509c
+SOURCE_URL=https://github.com/Chocobozzz/PeerTube/releases/download/v1.0.0-beta.4/peertube-v1.0.0-beta.4.zip
+SOURCE_SUM=4d2b60e978c9b170c733b645440b1ea29ac8b69d85adc23c36fa58a9c9db20d6
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/production.yaml b/conf/production.yaml
index 2599f2d..be867e7 100644
--- a/conf/production.yaml
+++ b/conf/production.yaml
@@ -1,4 +1,5 @@
 listen:
+  hostname: 'localhost'
   port: __PORT__
 
 # Correspond to your reverse proxy "listen" configuration
@@ -6,6 +7,13 @@ webserver:
   https: true
   hostname: '__domain__'
   port: 443
+ 
+# Proxies to trust to get real client IP
+# If you run PeerTube just behind a local proxy (nginx), keep 'loopback'
+# If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet)
+trust_proxy:
+  - 'loopback'
+
 
 # Your database name will be "peertube"+database.suffix
 database:
@@ -79,11 +87,11 @@ transcoding:
   enabled: false
   threads: 2
   resolutions: # Only created if the original video has a higher resolution
-    240p: true
-    360p: true
-    480p: true
-    720p: true
-    1080p: true
+    240p: false
+    360p: false
+    480p: false
+    720p: false
+    1080p: false
 
 # Instance settings
 instance:
@@ -92,6 +100,9 @@ instance:
   description: '' # Support markdown
   terms: '' # Support markdown
   default_client_route: '/videos/trending'
+  # By default, "do_not_list" or "blur" or "display" NSFW videos
+  # Could be overridden per user with a setting
+  default_nsfw_policy: 'do_not_list'
   customizations:
     javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
     css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
diff --git a/scripts/backup b/scripts/backup
index 6049480..c9f1208 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -10,14 +10,12 @@ if [ ! -e _common.sh ]; then
 	# Get the _common.sh file if it's not in the current directory
 	cp ../settings/scripts/_common.sh ./_common.sh
 	cp ../settings/scripts/psql.sh ./psql.sh
-	cp ../settings/scripts/nodejs.sh ./nodejs.sh
-	chmod a+rx _common.sh psql.sh nodejs.sh
+	chmod a+rx _common.sh psql.sh 
 fi
 
 source _common.sh
 source /usr/share/yunohost/helpers
 source psql.sh
-source nodejs.sh
 
 #=================================================
 # MANAGE SCRIPT FAILURE
diff --git a/scripts/install b/scripts/install
index 8d9466a..fd7a9de 100644
--- a/scripts/install
+++ b/scripts/install
@@ -9,7 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 source psql.sh
-source nodejs.sh
 
 #=================================================
 # MANAGE SCRIPT FAILURE
@@ -92,9 +91,9 @@ mkdir -p "$datadir"
 ynh_install_nodejs 8
 
 # install yarn
-wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb
-echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die
-dpkg -i yarn_1.5.1_all.deb
+wget https://github.com/yarnpkg/yarn/releases/download/v1.6.0/yarn_1.6.0_all.deb
+echo "96866d835da94a1f01a616f3d637c9100e826f65cb38a65e5d96ccf01ff6d692  yarn_1.6.0_all.deb" | sha256sum -c || ynh_die
+dpkg -i yarn_1.6.0_all.deb
 
 # add backports (required to install ffmpeg)
 echo "deb http://httpredir.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
diff --git a/scripts/remove b/scripts/remove
index b89b9d1..7224c83 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,7 +10,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 source psql.sh
-source nodejs.sh
 
 #=================================================
 # LOAD SETTINGS
diff --git a/scripts/restore b/scripts/restore
index fad985e..2d9eb88 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,14 +10,13 @@ if [ ! -e _common.sh ]; then
 	# Get the _common.sh file if it's not in the current directory
 	cp ../settings/scripts/_common.sh ./_common.sh
 	cp ../settings/scripts/psql.sh ./psql.sh
-	cp ../settings/scripts/nodejs.sh ./nodejs.sh
-	chmod a+rx _common.sh psql.sh nodejs.sh
+	chmod a+rx _common.sh psql.sh
 fi
 
 source _common.sh
 source /usr/share/yunohost/helpers
 source psql.sh
-source nodejs.sh
+
 
 #=================================================
 # MANAGE SCRIPT FAILURE
diff --git a/scripts/upgrade b/scripts/upgrade
index 930d85f..a15153e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,7 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 source psql.sh
-source nodejs.sh
 
 #=================================================
 # LOAD SETTINGS