aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--server/initializers/constants.ts2
-rw-r--r--server/tools/import-videos.ts8
-rw-r--r--support/doc/dependencies.md10
-rw-r--r--support/doc/production.md6
4 files changed, 19 insertions, 7 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 705d9b520..481b21bbb 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -226,7 +226,7 @@ const CONSTRAINTS_FIELDS = {
226 COUNT: { min: 0 } 226 COUNT: { min: 0 }
227 }, 227 },
228 VIDEO_COMMENTS: { 228 VIDEO_COMMENTS: {
229 TEXT: { min: 2, max: 3000 }, // Length 229 TEXT: { min: 1, max: 3000 }, // Length
230 URL: { min: 3, max: 2000 } // Length 230 URL: { min: 3, max: 2000 } // Length
231 }, 231 },
232 VIDEO_SHARE: { 232 VIDEO_SHARE: {
diff --git a/server/tools/import-videos.ts b/server/tools/import-videos.ts
index 433cee652..baaedd329 100644
--- a/server/tools/import-videos.ts
+++ b/server/tools/import-videos.ts
@@ -53,7 +53,10 @@ async function run () {
53 53
54 const options = [ '-j', '--flat-playlist', '--playlist-reverse' ] 54 const options = [ '-j', '--flat-playlist', '--playlist-reverse' ]
55 youtubeDL.getInfo(program['targetUrl'], options, processOptions, async (err, info) => { 55 youtubeDL.getInfo(program['targetUrl'], options, processOptions, async (err, info) => {
56 if (err) throw err 56 if (err) {
57 console.log(err.message)
58 process.exit(1)
59 }
57 60
58 let infoArray: any[] 61 let infoArray: any[]
59 62
@@ -157,7 +160,8 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, languag
157 160
158 await uploadVideo(program['url'], accessToken, videoAttributes) 161 await uploadVideo(program['url'], accessToken, videoAttributes)
159 } else { 162 } else {
160 throw err 163 console.log(err.message)
164 process.exit(1)
161 } 165 }
162 } 166 }
163 167
diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md
index 6db8a57d0..ab7fb2e4e 100644
--- a/support/doc/dependencies.md
+++ b/support/doc/dependencies.md
@@ -46,15 +46,19 @@ $ sudo pacman -S nodejs yarn ffmpeg postgresql openssl redis git wget unzip pyth
46 2. Install yarn: 46 2. Install yarn:
47 [https://yarnpkg.com/en/docs/install](https://yarnpkg.com/en/docs/install) 47 [https://yarnpkg.com/en/docs/install](https://yarnpkg.com/en/docs/install)
48 3. Install or compile ffmpeg: 48 3. Install or compile ffmpeg:
49 * Install - [https://www.webfoobar.com/index.php/node/17](https://www.webfoobar.com/index.php/node/17) 49 * Install - [https://linoxide.com/linux-how-to/install-ffmpeg-centos-7/](https://linoxide.com/linux-how-to/install-ffmpeg-centos-7/)
50 * Compile - [https://gist.github.com/mustafaturan/7053900#file-latest-ffmpeg-centos6-sh](https://gist.github.com/mustafaturan/7053900#file-latest-ffmpeg-centos6-sh) 50 * Compile - [https://gist.github.com/mustafaturan/7053900#file-latest-ffmpeg-centos6-sh](https://gist.github.com/mustafaturan/7053900#file-latest-ffmpeg-centos6-sh)
51 4. Run: 51 4. Run:
52 52
53``` 53```
54$ sudo yum update 54$ sudo yum update
55$ sudo yum install epel-release 55$ sudo yum install epel-release centos-release-scl
56$ sudo yum update 56$ sudo yum update
57$ sudo yum install nginx postgresql postgresql-server openssl gcc make redis git 57$ sudo yum install nginx postgresql postgresql-server openssl gcc-c++ make redis git devtoolset-6
58```
59
60 5. You need to use a more up to date version of G++ in order to run the yarn install command, hence the installation of devtoolset-6.
61$ sudo scl devtoolset-6 bash
58``` 62```
59 63
60## Other distributions 64## Other distributions
diff --git a/support/doc/production.md b/support/doc/production.md
index 3a58811b0..313b57889 100644
--- a/support/doc/production.md
+++ b/support/doc/production.md
@@ -51,7 +51,11 @@ $ sudo -u peertube wget -q "https://github.com/Chocobozzz/PeerTube/releases/down
51$ sudo -u peertube unzip peertube-${VERSION}.zip && sudo -u peertube rm peertube-${VERSION}.zip 51$ sudo -u peertube unzip peertube-${VERSION}.zip && sudo -u peertube rm peertube-${VERSION}.zip
52``` 52```
53 53
54Install Peertube 54Install Peertube. If you're using CentOS7, do not forget to activate the devtoolset-6 software collection:
55```
56$ scl enable devtool-6 bash
57```
58And after that, follow the step as usual. Do not forget to exit the environment after installing Peertube.
55``` 59```
56$ cd ../ && sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest 60$ cd ../ && sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest
57$ cd ./peertube-latest && sudo -H -u peertube yarn install --production --pure-lockfile 61$ cd ./peertube-latest && sudo -H -u peertube yarn install --production --pure-lockfile