From 24907e456d1851fe42b9c1a7a52f923e7b8ec6aa Mon Sep 17 00:00:00 2001
From: Pongsan Sayampol <aonz1982@gmail.com>
Date: Mon, 30 Dec 2013 11:45:10 +0700
Subject: [PATCH 1/2] Fix the issue that the default values are saved to
 config.json

---
 src/install.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/install.js b/src/install.js
index b5c4d4b089..ef5aa47e28 100644
--- a/src/install.js
+++ b/src/install.js
@@ -134,6 +134,11 @@ var async = require('async'),
 								return next(new Error('unknown database : ' + config.database));
 							}
 
+							var allQuestions = install.redisQuestions.concat(install.mongoQuestions);
+							for(var x=0;x<allQuestions.length;x++) {
+								delete config[allQuestions[x].name];
+							}
+
 							config.bcrypt_rounds = 12;
 							config.upload_path = '/public/uploads';
 							config.use_port = config.use_port.slice(0, 1) === 'y';

From 2c6afb424488c0219e8cfb1d70e8f38d62936c3f Mon Sep 17 00:00:00 2001
From: Pongsan Sayampol <aonz1982@gmail.com>
Date: Mon, 30 Dec 2013 11:46:33 +0700
Subject: [PATCH 2/2] Add a way to set social network logins

---
 src/install.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/install.js b/src/install.js
index ef5aa47e28..520970d3e9 100644
--- a/src/install.js
+++ b/src/install.js
@@ -254,6 +254,21 @@ var async = require('async'),
 					}, function (err) {
 						meta.configs.init(next);
 					});
+
+					if (install.values) {
+						if (install.values['social:twitter:key'] && install.values['social:twitter:secret']) {
+							meta.configs.setOnEmpty('social:twitter:key', install.values['social:twitter:key']);
+							meta.configs.setOnEmpty('social:twitter:secret', install.values['social:twitter:secret']);
+						}
+						if (install.values['social:google:id'] && install.values['social:google:secret']) {
+							meta.configs.setOnEmpty('social:google:id', install.values['social:google:id']);
+							meta.configs.setOnEmpty('social:google:secret', install.values['social:google:secret']);
+						}
+						if (install.values['social:facebook:key'] && install.values['social:facebook:secret']) {
+							meta.configs.setOnEmpty('social:facebook:app_id', install.values['social:facebook:app_id']);
+							meta.configs.setOnEmpty('social:facebook:secret', install.values['social:facebook:secret']);
+						}
+					}
 				},
 				function (next) {
 					// Check if an administrator needs to be created