2 files changed, 5 insertions, 3 deletions

diff --git a/helpers/logger.js b/helpers/logger.js
index fa5b53708..436091730 100644
--- a/helpers/logger.js
+++ b/helpers/logger.js
@@ -3,15 +3,16 @@
   'use strict'
 
   var config = require('config')
+  var path = require('path')
   var winston = require('winston')
   winston.emitErrs = true
 
-  var logDir = __dirname + '/../' + config.get('storage.logs')
+  var logDir = path.join(__dirname, '..', config.get('storage.logs'))
   var logger = new winston.Logger({
     transports: [
       new winston.transports.File({
         level: 'debug',
-        filename: logDir + '/all-logs.log',
+        filename: path.join(logDir, 'all-logs.log'),
         handleExceptions: true,
         json: true,
         maxsize: 5242880,
diff --git a/helpers/peertubeCrypto.js b/helpers/peertubeCrypto.js
index 36271dba9..9031f6ae5 100644
--- a/helpers/peertubeCrypto.js
+++ b/helpers/peertubeCrypto.js
@@ -5,11 +5,12 @@
   var crypto = require('crypto')
   var fs = require('fs')
   var openssl = require('openssl-wrapper')
+  var path = require('path')
   var ursa = require('ursa')
 
   var logger = require('./logger')
 
-  var certDir = __dirname + '/../' + config.get('storage.certs')
+  var certDir = path.join(__dirname, '..', config.get('storage.certs'))
   var algorithm = 'aes-256-ctr'
 
   var peertubeCrypto = {