Prepare production workflow

This commit is contained in:
Chocobozzz 2018-01-15 11:10:46 +01:00
parent 633868bc2c
commit 6b2ef589ed
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
8 changed files with 57 additions and 34 deletions

10
.gitignore vendored
View File

@ -5,15 +5,7 @@
/test4/
/test5/
/test6/
/uploads/
/videos/
/avatars/
/thumbnails/
/previews/
/certs/
/logs/
/torrents/
/cache/
/storage/
/config/production.yaml
/ffmpeg/
/*.sublime-project

View File

@ -1,6 +1,6 @@
{
"name": "peertube-client",
"version": "0.0.1",
"version": "0.0.0-alpha",
"private": true,
"licence": "GPLv3",
"author": {

View File

@ -16,14 +16,14 @@ database:
# From the project root directory
storage:
avatars: 'avatars/'
certs: 'certs/'
videos: 'videos/'
logs: 'logs/'
previews: 'previews/'
thumbnails: 'thumbnails/'
torrents: 'torrents/'
cache: 'cache/'
avatars: 'storage/avatars/'
certs: 'storage/certs/'
videos: 'storage/videos/'
logs: 'storage/logs/'
previews: 'storage/previews/'
thumbnails: 'storage/thumbnails/'
torrents: 'storage/torrents/'
cache: 'storage/cache/'
cache:
previews:

View File

@ -17,14 +17,14 @@ database:
# From the project root directory
storage:
avatars: 'avatars/'
certs: 'certs/'
videos: 'videos/'
logs: 'logs/'
previews: 'previews/'
thumbnails: 'thumbnails/'
torrents: 'torrents/'
cache: 'cache/'
avatars: '../storage/avatars/'
certs: '../storage/certs/'
videos: '../storage/videos/'
logs: '../storage/logs/'
previews: '../storage/previews/'
thumbnails: '../storage/thumbnails/'
torrents: '../storage/torrents/'
cache: '../storage/cache/'
cache:
previews:

View File

@ -1,7 +1,7 @@
{
"name": "peertube",
"description": "Prototype of a decentralized video streaming platform using P2P (bittorent) directly in the web browser with WebTorrent and Angular 2.",
"version": "0.0.1",
"description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
"version": "0.0.0-alpha",
"private": true,
"licence": "GPLv3",
"engines": {

View File

@ -1,7 +1,33 @@
#!/bin/bash
npm run build
npm test
shutdown() {
# Get our process group id
PGID=$(ps -o pgid= $$ | grep -o [0-9]*)
# Kill it in a new new process group
setsid kill -- -$PGID
exit 0
}
trap "shutdown" SIGINT SIGTERM
if [ -z "$1" ]; then
echo "Need version as argument"
exit -1
fi
cd ./client || exit -1
npm version --no-git-tag-version --no-commit-hooks $1 || exit -1
cd ../ || exit -1
npm version -f --no-git-tag-version --no-commit-hooks $1 || exit -1
git commit package.json client/package.json -m "Bumped to version $1" || exit -1
git tag -s -a "v$1" -m "v$1"
npm run build || exit -1
#npm test || exit -1
cd ../ || exit -1
rm -f PeerTube/peertube.zip || exit -1
zip -r PeerTube/peertube.zip PeerTube/{CREDITS.md,node_modules,FAQ.md,LICENSE,README.md,client/dist/,client/yarn.lock,client/package.json,config,dist,package.json,scripts,support,tsconfig.json,yarn.lock}

View File

@ -1,8 +1,7 @@
import * as Promise from 'bluebird'
import * as Bluebird from 'bluebird'
import { createWriteStream } from 'fs'
import * as request from 'request'
import { ACTIVITY_PUB } from '../initializers'
import Bluebird = require('bluebird')
function doRequest (
requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }
@ -12,13 +11,13 @@ function doRequest (
requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER
}
return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
return new Bluebird<{ response: request.RequestResponse, body: any }>((res, rej) => {
request(requestOptions, (err, response, body) => err ? rej(err) : res({ response, body }))
})
}
function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.UriOptions, destPath: string) {
return new Promise<request.RequestResponse>((res, rej) => {
return new Bluebird<request.RequestResponse>((res, rej) => {
request(requestOptions)
.on('response', response => res(response as request.RequestResponse))
.on('error', err => rej(err))

View File

@ -199,6 +199,12 @@ Tell systemd to reload its config:
sudo systemctl daemon-reload
```
If you want to start PeerTube on boot:
```
sudo systemctl enabled peertube
```
### Run
```