From ce7513c3472c74c331fa4aa2b8d0b193940d2bc8 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Fri, 4 Nov 2016 20:02:17 +0300
Subject: [PATCH] allow cookieDomain from config.json

---
 src/webserver.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/webserver.js b/src/webserver.js
index c2233761b3..bedcb07f02 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -187,8 +187,8 @@ function setupCookie() {
 		maxAge: 1000 * 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 14)
 	};
 
-	if (meta.config.cookieDomain) {
-		cookie.domain = meta.config.cookieDomain;
+	if (nconf.get('cookieDomain') || meta.config.cookieDomain) {
+		cookie.domain = nconf.get('cookieDomain') || meta.config.cookieDomain;
 	}
 
 	if (nconf.get('secure')) {