Server: host -> hostname (host = hostname + port)

diff --git a/config/default.yaml b/config/default.yaml
index 909bec1776920895fa8e810f62a6692779c82b00..ad27b4eb899f7156774ab00104e9db0c5cc97953 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -3,11 +3,11 @@ listen:
 
 webserver:
   https: false
-  host: 'localhost'
+  hostname: 'localhost'
   port: 9000
 
 database:
-  host: 'localhost'
+  hostname: 'localhost'
   port: 27017
   suffix: '-dev'
 

diff --git a/config/production.yaml.example b/config/production.yaml.example
index 8bc63ee92461967b65a65e29c15a4c7bdd382ce8..056ace4341a4a3c9d6907e7b6b4ecb7ed54ef687 100644 (file)
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -1,7 +1,7 @@
 # Correspond to your reverse proxy "listen" configuration
 webserver:
   https: false
-  host: 'example.com'
+  hostname: 'example.com'
   port: 80
 
 database:

diff --git a/config/test-1.yaml b/config/test-1.yaml
index 4be44abc79fa30ae626d380cfa0fad747344f3a0..6dcc7f294ad7ef941657488142e452f286cae6ac 100644 (file)
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -2,7 +2,7 @@ listen:
   port: 9001
 
 webserver:
-  host: 'localhost'
+  hostname: 'localhost'
   port: 9001
 
 database:

diff --git a/config/test-2.yaml b/config/test-2.yaml
index c723e6863ee5d7f324d23a789cdc337521837d85..209525963adfd5bc58eda2839c31fd017a509bb8 100644 (file)
--- a/config/test-2.yaml
+++ b/config/test-2.yaml
@@ -2,7 +2,7 @@ listen:
   port: 9002
 
 webserver:
-  host: 'localhost'
+  hostname: 'localhost'
   port: 9002
 
 database:

diff --git a/config/test-3.yaml b/config/test-3.yaml
index 58417c34b59b0abe5e635c0b0acbf38943021dc1..15719d107f9c57109b4b9996c7eb88748be91af9 100644 (file)
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -2,7 +2,7 @@ listen:
   port: 9003
 
 webserver:
-  host: 'localhost'
+  hostname: 'localhost'
   port: 9003
 
 database:

diff --git a/config/test-4.yaml b/config/test-4.yaml
index 68253cae90395a46d9e40117f4af7c5e3f184cab..e6f34d0130f17d522f5e1b99e9fae7777e509eee 100644 (file)
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -2,7 +2,7 @@ listen:
   port: 9004
 
 webserver:
-  host: 'localhost'
+  hostname: 'localhost'
   port: 9004
 
 database:

diff --git a/config/test-5.yaml b/config/test-5.yaml
index aafd4588969d4dd86bf3d5d2197cce8d63b9d40f..fdeec76d400ed55efdafb45128d3a5d7c5bc3da9 100644 (file)
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -2,7 +2,7 @@ listen:
   port: 9005
 
 webserver:
-  host: 'localhost'
+  hostname: 'localhost'
   port: 9005
 
 database:

diff --git a/config/test-6.yaml b/config/test-6.yaml
index ba83b0bc1db426c1bded8739aebb254f2c610d6b..0c9630c897a91c2fa0785d596ee8a8a818da1f3d 100644 (file)
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -2,7 +2,7 @@ listen:
   port: 9006
 
 webserver:
-  host: 'localhost'
+  hostname: 'localhost'
   port: 9006
 
 database:

diff --git a/config/test.yaml b/config/test.yaml
index 8a667a001d6c284066b105ad28f28b55761e1ddd..06705a987b2d488b26c554b1dc013bb8b5466834 100644 (file)
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -5,5 +5,5 @@ webserver:
   https: false
 
 database:
-  host: 'localhost'
+  hostname: 'localhost'
   port: 27017

diff --git a/server/controllers/api/clients.js b/server/controllers/api/clients.js
index ce1149227b6a7ea0601231a8af5708459eada74f..b0135419588ba0b3a15759d26c9c1b2facb4bb8e 100644 (file)
--- a/server/controllers/api/clients.js
+++ b/server/controllers/api/clients.js
@@ -13,9 +13,9 @@ router.get('/local', getLocalClient)
 
 // Get the client credentials for the PeerTube front end
 function getLocalClient (req, res, next) {
-  const serverHost = constants.CONFIG.WEBSERVER.HOST
+  const serverHostname = constants.CONFIG.WEBSERVER.HOSTNAME
   const serverPort = constants.CONFIG.WEBSERVER.PORT
-  let headerHostShouldBe = serverHost
+  let headerHostShouldBe = serverHostname
   if (serverPort !== 80 && serverPort !== 443) {
     headerHostShouldBe += ':' + serverPort
   }

diff --git a/server/helpers/logger.js b/server/helpers/logger.js
index 590ceaeb6c5be0ef69761166f497ed8a7d8b54ff..fcc1789fd53875978bb654c9a9a9788f4030b4a4 100644 (file)
--- a/server/helpers/logger.js
+++ b/server/helpers/logger.js
@@ -8,7 +8,7 @@ winston.emitErrs = true
 
 const constants = require('../initializers/constants')
 
-const label = constants.CONFIG.WEBSERVER.HOST + ':' + constants.CONFIG.WEBSERVER.PORT
+const label = constants.CONFIG.WEBSERVER.HOSTNAME + ':' + constants.CONFIG.WEBSERVER.PORT
 
 // Create the directory if it does not exist
 mkdirp.sync(constants.CONFIG.STORAGE.LOG_DIR)

diff --git a/server/initializers/checker.js b/server/initializers/checker.js
index 0bc5df92ff9ceae64fd427f10f5d77f6fc73c719..4ecabac77fcf230fcd7cff857f10bd24ce2ae0b2 100644 (file)
--- a/server/initializers/checker.js
+++ b/server/initializers/checker.js
@@ -15,8 +15,8 @@ const checker = {
 // Check the config files
 function checkConfig () {
   const required = [ 'listen.port',
-    'webserver.https', 'webserver.host', 'webserver.port',
-    'database.host', 'database.port', 'database.suffix',
+    'webserver.https', 'webserver.hostname', 'webserver.port',
+    'database.hostname', 'database.port', 'database.suffix',
     'storage.certs', 'storage.videos', 'storage.logs', 'storage.thumbnails'
   ]
   const miss = []

diff --git a/server/initializers/constants.js b/server/initializers/constants.js
index 8a8d5c1ce562ad7986dedd7042d37aecc3f07c44..5ccd427739c3050c12b348b61a6b183f9c90ef3a 100644 (file)
--- a/server/initializers/constants.js
+++ b/server/initializers/constants.js
@@ -32,7 +32,7 @@ const OAUTH_LIFETIME = {
 const CONFIG = {
   DATABASE: {
     DBNAME: 'peertube' + config.get('database.suffix'),
-    HOST: config.get('database.host'),
+    HOSTNAME: config.get('database.hostname'),
     PORT: config.get('database.port')
   },
   STORAGE: {
@@ -45,11 +45,11 @@ const CONFIG = {
   WEBSERVER: {
     SCHEME: config.get('webserver.https') === true ? 'https' : 'http',
     WS: config.get('webserver.https') === true ? 'wss' : 'ws',
-    HOST: config.get('webserver.host'),
+    HOSTNAME: config.get('webserver.hostname'),
     PORT: config.get('webserver.port')
   }
 }
-CONFIG.WEBSERVER.URL = CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOST + ':' + CONFIG.WEBSERVER.PORT
+CONFIG.WEBSERVER.URL = CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
 
 // ---------------------------------------------------------------------------
 

diff --git a/server/initializers/database.js b/server/initializers/database.js
index 632040b81f96b083b4b32b077db2b5c89631f00a..0564e4e77fdd824c73ff21c3f0ffc504eec0f5a9 100644 (file)
--- a/server/initializers/database.js
+++ b/server/initializers/database.js
@@ -22,7 +22,7 @@ const database = {
 
 function connect () {
   mongoose.Promise = global.Promise
-  mongoose.connect('mongodb://' + constants.CONFIG.DATABASE.HOST + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME)
+  mongoose.connect('mongodb://' + constants.CONFIG.DATABASE.HOSTNAME + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME)
   mongoose.connection.on('error', function () {
     throw new Error('Mongodb connection error.')
   })

diff --git a/server/lib/friends.js b/server/lib/friends.js
index b2ad0bbb3038a55d2c1b371cf1fa6028f6f21d2a..3f100545c28796912cac22877cea0895c54381bb 100644 (file)
--- a/server/lib/friends.js
+++ b/server/lib/friends.js
@@ -273,7 +273,7 @@ function isMe (url) {
   const hostname = parsedUrl.hostname
   const port = parseInt(parsedUrl.port)
 
-  const myHostname = constants.CONFIG.WEBSERVER.HOST
+  const myHostname = constants.CONFIG.WEBSERVER.HOSTNAME
   const myPort = constants.CONFIG.WEBSERVER.PORT
 
   return hostname === myHostname && port === myPort

diff --git a/server/models/video.js b/server/models/video.js
index 05c4f51cb2d7211918e71f5c261b605c2d90b51c..be3e80598e84f96eb5290e0a44bdeca3501aa2cf 100644 (file)
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -102,7 +102,7 @@ VideoSchema.pre('save', function (next) {
       function (callback) {
         const options = {
           announceList: [
-            [ constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOST + ':' + constants.CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
+            [ constants.CONFIG.WEBSERVER.WS + '://' + constants.CONFIG.WEBSERVER.HOSTNAME + ':' + constants.CONFIG.WEBSERVER.PORT + '/tracker/socket' ]
           ],
           urlList: [
             constants.CONFIG.WEBSERVER.URL + constants.STATIC_PATHS.WEBSEED + video.filename