allow cookieDomain from config.json

8 years ago · ce7513c347
parent f30b694545
commit ce7513c347
1 changed files with 2 additions and 2 deletions
--- 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) {
+	if (nconf.get('cookieDomain') || meta.config.cookieDomain) {
-		cookie.domain = meta.config.cookieDomain;
+		cookie.domain = nconf.get('cookieDomain') || meta.config.cookieDomain;
 	}
 	if (nconf.get('secure')) {