From 3432b900df405e20f4245ac6fc048de16c35d9cf Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 15 Sep 2019 00:37:46 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=A7=81=ED=9B=84=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20gitpath=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i_entrance/j_server_get_admin_status.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php
index 4c842c8b..358df58d 100644
--- a/i_entrance/j_server_get_admin_status.php
+++ b/i_entrance/j_server_get_admin_status.php
@@ -76,7 +76,7 @@ foreach (AppConf::getList() as $setting) {
         'korName' => $serverKorName,
         'color' => $serverColor,
         'isRoot' => $serverDir == $rootServer,
-        'lastGitPath' => ($serverGitPath[$serverDir][0])??'origin/master'
+        'lastGitPath' => ($serverGitPath[$serverDir][0])??'origin/devel'
     ];
     $server[] = $state;
 }  

From 3fee29e9e946073ea8eac953d2c5e0bdf8669c74 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 15 Sep 2019 00:55:57 +0900
Subject: [PATCH 2/4] =?UTF-8?q?setup=5Fdb=EC=97=90=EC=84=9C=20global=5Fsal?=
 =?UTF-8?q?t=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 f_install/j_setup_db.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php
index ee5f88c7..926f6791 100644
--- a/f_install/j_setup_db.php
+++ b/f_install/j_setup_db.php
@@ -280,5 +280,6 @@ if ($result !== true) {
 
 Json::die([
     'result'=>true,
-    'reason'=>'success'
+    'reason'=>'success',
+    'globalSalt'=>$globalSalt
 ]);

From b5922095f03ce8324ed843b67bcaf2eb20cb4fb0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 15 Sep 2019 02:50:10 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=86=A8=EB=9F=AC=20?=
 =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=ED=8A=B8=EC=9C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 f_install/j_setup_db.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php
index 926f6791..01b7833a 100644
--- a/f_install/j_setup_db.php
+++ b/f_install/j_setup_db.php
@@ -12,6 +12,10 @@ $servHost = Util::getReq('serv_host');
 $sharedIconPath = Util::getReq('shared_icon_path');
 $gameImagePath = Util::getReq('game_image_path');
 
+$kakaoRESTKey = Util::getReq('kakao_rest_key', '');
+$kakaoAdminKey = Util::getReq('kakao_admin_key', '');
+
+
 if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) {
     Json::die([
         'result'=>false,
@@ -263,10 +267,15 @@ $result = Util::generateFileUsingSimpleTemplate(
     ]
 );
 
+$kakaoRedirectURI = WebUtil::resolveRelativePath('oauth_kakao/oauth.php', $servHost);
+
 Util::generateFileUsingSimpleTemplate(
     __dir__.'/templates/KakaoKey.orig.php',
     ROOT.'/d_setting/KakaoKey.php',
     [
+        'REST_API_KEY'=>$kakaoRESTKey,
+        'ADMIN_KEY'=>$kakaoAdminKey,
+        'REDIRECT_URI'=>$kakaoRedirectURI
     ],
     true
 );

From 87a0e73c96e10f2e42e82003a2ece73f7f4b2d2c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 15 Sep 2019 02:59:38 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=86=A8=EB=9F=AC=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 f_install/j_setup_db.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php
index 01b7833a..afc1249f 100644
--- a/f_install/j_setup_db.php
+++ b/f_install/j_setup_db.php
@@ -12,8 +12,8 @@ $servHost = Util::getReq('serv_host');
 $sharedIconPath = Util::getReq('shared_icon_path');
 $gameImagePath = Util::getReq('game_image_path');
 
-$kakaoRESTKey = Util::getReq('kakao_rest_key', '');
-$kakaoAdminKey = Util::getReq('kakao_admin_key', '');
+$kakaoRESTKey = Util::getReq('kakao_rest_key', 'string', '');
+$kakaoAdminKey = Util::getReq('kakao_admin_key', 'string', '');
 
 
 if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) {