Prepare production workflow

diff --git a/.gitignore b/.gitignore
index fa7974ae428ccd88774d97c23f9266e234c29103..13f31db4ba039fb680823a9a83e3b06132901565 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,15 +5,7 @@
 /test4/
 /test5/
 /test6/
-/uploads/
-/videos/
-/avatars/
-/thumbnails/
-/previews/
-/certs/
-/logs/
-/torrents/
-/cache/
+/storage/
 /config/production.yaml
 /ffmpeg/
 /*.sublime-project

diff --git a/client/package.json b/client/package.json
index ad07f31b001519090533d57fe86e0c5a1ac3235d..10634c3c4de0a93d1ba524cf5fdbb16e972d13dd 100644 (file)
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube-client",
-  "version": "0.0.1",
+  "version": "0.0.0-alpha",
   "private": true,
   "licence": "GPLv3",
   "author": {

diff --git a/config/default.yaml b/config/default.yaml
index 2c1043067ce432bbb8d30283516d1faae7cda3b3..ee744682655828fd803ff35fb4dddff26f12d710 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -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:

diff --git a/config/production.yaml.example b/config/production.yaml.example
index 404d35c16f51e6424f883c9050f1a7568542564e..660477196c4c26d4b6b29fb801986b8e88038a86 100644 (file)
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -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:

diff --git a/package.json b/package.json
index efe03dc04f8763332bbe5e177d72ed0d86f9683e..213c6e7a669ea9878a90904542c63ea1b59dc3d9 100644 (file)
--- a/package.json
+++ b/package.json
@@ -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": {

diff --git a/scripts/release.sh b/scripts/release.sh
index 572e6bdca86188974105df74746f7e7b939d909d..07fec00b83b6ededcdccde9862dd70eb471c2a70 100755 (executable)
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -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}

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index e8d77b15b5789cfd74aff8b8254f99c903bd3d88..eb8a12868137802fec658275874ed9e488f74597 100644 (file)
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -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))

diff --git a/support/doc/production.md b/support/doc/production.md
index 118704da3195a746f640e1d8892e8ef5a64262b7..a8ed2af883e01a35ffb50e85516299e9bf3afbca 100644 (file)
--- a/support/doc/production.md
+++ b/support/doc/production.md
@@ -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
 
 ```