16 files changed, 21 insertions, 21 deletions

diff --git a/config/default.yaml b/config/default.yaml
index 909bec177..ad27b4eb8 100644
--- 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 8bc63ee92..056ace434 100644
--- 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 4be44abc7..6dcc7f294 100644
--- 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 c723e6863..209525963 100644
--- 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 58417c34b..15719d107 100644
--- 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 68253cae9..e6f34d013 100644
--- 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 aafd45889..fdeec76d4 100644
--- 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 ba83b0bc1..0c9630c89 100644
--- 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 8a667a001..06705a987 100644
--- 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 ce1149227..b01354195 100644
--- 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 590ceaeb6..fcc1789fd 100644
--- 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 0bc5df92f..4ecabac77 100644
--- 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 8a8d5c1ce..5ccd42773 100644
--- 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 632040b81..0564e4e77 100644
--- 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 b2ad0bbb3..3f100545c 100644
--- 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 05c4f51cb..be3e80598 100644
--- 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