aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-07-23 09:40:28 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-07-23 09:43:44 +0200
commit407c4473ad6b1aa30c3d77bd75e3c273d03989b8 (patch)
treed933d6b4dcd04c131cd245c92eca13ad9f3127a6
parentd063f8ca92070103ea1847cf8607ecae93e679ba (diff)
downloadPeerTube-407c4473ad6b1aa30c3d77bd75e3c273d03989b8.tar.gz
PeerTube-407c4473ad6b1aa30c3d77bd75e3c273d03989b8.tar.zst
PeerTube-407c4473ad6b1aa30c3d77bd75e3c273d03989b8.zip
Fix upgrade script \n
-rw-r--r--.gitignore1
-rwxr-xr-xscripts/upgrade-peertube.sh2
-rw-r--r--server.ts4
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 169027c36..42d4f5926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
18/*.sublime-project 18/*.sublime-project
19/*.sublime-workspace 19/*.sublime-workspace
20/dist 20/dist
21/.idea
diff --git a/scripts/upgrade-peertube.sh b/scripts/upgrade-peertube.sh
index f7b856470..5186a269f 100755
--- a/scripts/upgrade-peertube.sh
+++ b/scripts/upgrade-peertube.sh
@@ -35,4 +35,4 @@ git pull origin $(git rev-parse --abbrev-ref HEAD) || exit -1
35yarn install --pure-lockfile 35yarn install --pure-lockfile
36npm run build 36npm run build
37 37
38echo "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts." 38echo -e "\n\nUpgrade finished! You can restart PeerTube that may run the migration scripts."
diff --git a/server.ts b/server.ts
index a6a9fcb02..1ba208c28 100644
--- a/server.ts
+++ b/server.ts
@@ -24,7 +24,7 @@ process.title = 'peertube'
24const app = express() 24const app = express()
25 25
26// ----------- Database ----------- 26// ----------- Database -----------
27// Do not use barels because we don't want to load all modules here (we need to initialize database first) 27// Do not use barrels because we don't want to load all modules here (we need to initialize database first)
28import { logger } from './server/helpers/logger' 28import { logger } from './server/helpers/logger'
29import { API_VERSION, CONFIG } from './server/initializers/constants' 29import { API_VERSION, CONFIG } from './server/initializers/constants'
30// Initialize database and models 30// Initialize database and models
@@ -55,7 +55,7 @@ import { apiRouter, clientsRouter, staticRouter } from './server/controllers'
55 55
56// ----------- App ----------- 56// ----------- App -----------
57 57
58// Enable cors for develop 58// Enable CORS for develop
59if (isTestInstance()) { 59if (isTestInstance()) {
60 app.use(cors({ 60 app.use(cors({
61 origin: 'http://localhost:3000', 61 origin: 'http://localhost:3000',