6 files changed, 33 insertions, 29 deletions

diff --git a/.gitignore b/.gitignore
index fa7974ae4..13f31db4b 100644
--- 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/config/default.yaml b/config/default.yaml
index 2c1043067..ee7446826 100644
--- 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 404d35c16..660477196 100644
--- 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/scripts/release.sh b/scripts/release.sh
index 572e6bdca..1c23c228c 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+if [ -z "$1" ]; then
+  echo "Need version as argument"
+  exti -1
+fi
+
+npm version $1
+
 npm run build
 npm test
 
diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index e8d77b15b..eb8a12868 100644
--- 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 118704da3..a8ed2af88 100644
--- 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
 
 ```