interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Chocobozzz/PeerTube into develop

This commit is contained in:
Gérald Niel 2018-03-25 15:56:45 +02:00
parent 5c25dbc22d 5c5638a062
commit 5b107cd341
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/initializers/constants.ts
View File

@ -226,7 +226,7 @@ const CONSTRAINTS_FIELDS = {
COUNT: { min: 0 } COUNT: { min: 0 }
}, },
VIDEO_COMMENTS: { VIDEO_COMMENTS: {
TEXT: { min: 2, max: 3000 }, // Length TEXT: { min: 1, max: 3000 }, // Length
URL: { min: 3, max: 2000 } // Length URL: { min: 3, max: 2000 } // Length
}, },
VIDEO_SHARE: { VIDEO_SHARE: {

8
server/tools/import-videos.ts
View File

@ -53,7 +53,10 @@ async function run () {
const options = [ '-j', '--flat-playlist', '--playlist-reverse' ] const options = [ '-j', '--flat-playlist', '--playlist-reverse' ]
youtubeDL.getInfo(program['targetUrl'], options, processOptions, async (err, info) => { youtubeDL.getInfo(program['targetUrl'], options, processOptions, async (err, info) => {
if (err) throw err if (err) {
console.log(err.message)
process.exit(1)
}
let infoArray: any[] let infoArray: any[]
@ -157,7 +160,8 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, languag
await uploadVideo(program['url'], accessToken, videoAttributes) await uploadVideo(program['url'], accessToken, videoAttributes)
} else { } else {
throw err console.log(err.message)
process.exit(1)
} }
} }

10
support/doc/dependencies.md
View File

@ -46,15 +46,19 @@ $ sudo pacman -S nodejs yarn ffmpeg postgresql openssl redis git wget unzip pyth
2. Install yarn: 2. Install yarn:
[https://yarnpkg.com/en/docs/install](https://yarnpkg.com/en/docs/install) [https://yarnpkg.com/en/docs/install](https://yarnpkg.com/en/docs/install)
3. Install or compile ffmpeg: 3. Install or compile ffmpeg:
* Install - [https://www.webfoobar.com/index.php/node/17](https://www.webfoobar.com/index.php/node/17) * Install - [https://linoxide.com/linux-how-to/install-ffmpeg-centos-7/](https://linoxide.com/linux-how-to/install-ffmpeg-centos-7/)
* Compile - [https://gist.github.com/mustafaturan/7053900#file-latest-ffmpeg-centos6-sh](https://gist.github.com/mustafaturan/7053900#file-latest-ffmpeg-centos6-sh) * Compile - [https://gist.github.com/mustafaturan/7053900#file-latest-ffmpeg-centos6-sh](https://gist.github.com/mustafaturan/7053900#file-latest-ffmpeg-centos6-sh)
4. Run: 4. Run:
``` ```
$ sudo yum update $ sudo yum update
$ sudo yum install epel-release $ sudo yum install epel-release centos-release-scl
$ sudo yum update $ sudo yum update
$ sudo yum install nginx postgresql postgresql-server openssl gcc make redis git $ sudo yum install nginx postgresql postgresql-server openssl gcc-c++ make redis git devtoolset-6
```
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.
$ sudo scl devtoolset-6 bash
``` ```
## Other distributions ## Other distributions

6
support/doc/production.md
View File

@ -51,7 +51,11 @@ $ sudo -u peertube wget -q "https://github.com/Chocobozzz/PeerTube/releases/down
$ sudo -u peertube unzip peertube-${VERSION}.zip && sudo -u peertube rm peertube-${VERSION}.zip $ sudo -u peertube unzip peertube-${VERSION}.zip && sudo -u peertube rm peertube-${VERSION}.zip
``` ```
Install Peertube Install Peertube. If you're using CentOS7, do not forget to activate the devtoolset-6 software collection:
```
$ scl enable devtool-6 bash
```
And after that, follow the step as usual. Do not forget to exit the environment after installing Peertube.
``` ```
$ cd ../ && sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest $ cd ../ && sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest
$ cd ./peertube-latest && sudo -H -u peertube yarn install --production --pure-lockfile $ cd ./peertube-latest && sudo -H -u peertube yarn install --production --pure-lockfile