diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-23 19:41:17 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-26 20:28:34 +0200 |
commit | 3737bbafb109a79f77c3047eb9b2791e6b57344e (patch) | |
tree | 60a12fceac8345fc124b3d9c045732d72395bfc3 /server/initializers/constants.js | |
parent | 2c49ca42d14087ce8e1695759435f796a290470b (diff) | |
download | PeerTube-3737bbafb109a79f77c3047eb9b2791e6b57344e.tar.gz PeerTube-3737bbafb109a79f77c3047eb9b2791e6b57344e.tar.zst PeerTube-3737bbafb109a79f77c3047eb9b2791e6b57344e.zip |
Server: host -> hostname (host = hostname + port)
Diffstat (limited to 'server/initializers/constants.js')
-rw-r--r-- | server/initializers/constants.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/initializers/constants.js b/server/initializers/constants.js index 8a8d5c1ce..5ccd42773 100644 --- a/server/initializers/constants.js +++ b/server/initializers/constants.js | |||
@@ -32,7 +32,7 @@ const OAUTH_LIFETIME = { | |||
32 | const CONFIG = { | 32 | const CONFIG = { |
33 | DATABASE: { | 33 | DATABASE: { |
34 | DBNAME: 'peertube' + config.get('database.suffix'), | 34 | DBNAME: 'peertube' + config.get('database.suffix'), |
35 | HOST: config.get('database.host'), | 35 | HOSTNAME: config.get('database.hostname'), |
36 | PORT: config.get('database.port') | 36 | PORT: config.get('database.port') |
37 | }, | 37 | }, |
38 | STORAGE: { | 38 | STORAGE: { |
@@ -45,11 +45,11 @@ const CONFIG = { | |||
45 | WEBSERVER: { | 45 | WEBSERVER: { |
46 | SCHEME: config.get('webserver.https') === true ? 'https' : 'http', | 46 | SCHEME: config.get('webserver.https') === true ? 'https' : 'http', |
47 | WS: config.get('webserver.https') === true ? 'wss' : 'ws', | 47 | WS: config.get('webserver.https') === true ? 'wss' : 'ws', |
48 | HOST: config.get('webserver.host'), | 48 | HOSTNAME: config.get('webserver.hostname'), |
49 | PORT: config.get('webserver.port') | 49 | PORT: config.get('webserver.port') |
50 | } | 50 | } |
51 | } | 51 | } |
52 | CONFIG.WEBSERVER.URL = CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOST + ':' + CONFIG.WEBSERVER.PORT | 52 | CONFIG.WEBSERVER.URL = CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT |
53 | 53 | ||
54 | // --------------------------------------------------------------------------- | 54 | // --------------------------------------------------------------------------- |
55 | 55 | ||