nginx 구성에 맞게 변경

- 기본 board로 rhymix 추가

hidche/install/install_hidche.py

@@ -20,6 +20,10 @@ indexPHP = '%s/index.php'%wwwRoot
 if os.path.exists('%s/hwe/d_setting/DB.php'):
     exit(0)
 
+headers = {
+    "X-Requested-With": "XMLHttpRequest",
+}
+
 useWaitIndex = False
 if not os.path.exists(indexPHP):
     useWaitIndex = True
@@ -60,11 +64,6 @@ session = requests.session()
 db_root_pw = hash_password('root'+env['HIDCHE_PW_SALT'], env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
 db_root_name = '%s_root'%env['HIDCHE_DB_PREFIX']
 
-if 'HIDCHE_IMAGE_REQUEST_KEY' in env and len(env['HIDCHE_IMAGE_REQUEST_KEY'])>=16:
-    image_request_key = env['HIDCHE_IMAGE_REQUEST_KEY']
-else:
-    image_request_key = os.urandom(16).hex()
-
 setupDBResult = session.post('http://web/sam/f_install/j_setup_db.php', {
     'db_host':'db',
     'db_port':3306,
@@ -74,12 +73,11 @@ setupDBResult = session.post('http://web/sam/f_install/j_setup_db.php', {
     'serv_host':env['HIDCHE_GAME_PATH'],
     'shared_icon_path':'%s/icons'%env['HIDCHE_IMAGE_PATH'],
     'game_image_path':'%s/game'%env['HIDCHE_IMAGE_PATH'],
-    'image_request_key':image_request_key,
     'kakao_rest_key':env['HIDCHE_KAKAO_REST_KEY'],
     'kakao_admin_key':env['HIDCHE_KAKAO_ADMIN_KEY'],
-})
+}, headers=headers)
 setupDBJsonResult = json.loads(setupDBResult.text)
-print(setupDBJsonResult, flush=True)
+print(setupDBJsonResult)
 
 globalSalt = setupDBJsonResult['globalSalt']
 
@@ -90,27 +88,21 @@ query = {
     'password':hashPassword,
     'nickname':'운영자'
 }
-setupAdminResult = session.post('http://web/sam/f_install/j_create_admin.php', query)
+setupAdminResult = session.post('http://web/sam/f_install/j_create_admin.php', query, headers=headers)
 setupAdminJsonResult = json.loads(setupAdminResult.text)
-print(setupAdminJsonResult, flush=True)
+print(setupAdminJsonResult)
 
-loginResult = session.post('http://web/sam/j_login.php', query)
-print(loginResult.text, flush=True)
+loginResult = session.post('http://web/sam/j_login.php', query, headers=headers)
+print(loginResult.text)
 
 serverList = str(env['HIDCHE_SERVER_LIST']).split(',')
 serverList.reverse()
-
-currentBranch = 'devel'
-for idx, serverName in enumerate(serverList):
-    if idx == 0:
-        target = currentBranch
-    else:
-        target = 'origin/'+currentBranch
+for serverName in serverList:
     updateResult = session.post('http://web/sam/j_updateServer.php', {
         'server':serverName,
-        'target':target
-    })
-    print(serverName, updateResult.text, flush=True)
+        'target':'origin/devel'
+    }, headers=headers)
+    print(serverName, updateResult.text)
 
     db_pw = hash_password(serverName+env['HIDCHE_PW_SALT'], env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
     db_name = '%s_%s'%(env['HIDCHE_DB_PREFIX'], serverName)
@@ -120,13 +112,13 @@ for idx, serverName in enumerate(serverList):
         'db_id':db_name,
         'db_pw':db_pw,
         'db_name':db_name,
-    })
-    print(serverName, resetResult.text, flush=True)
+    }, headers=headers)
+    print(serverName, resetResult.text)
 
 if useWaitIndex:
     fp = open(indexPHP, 'wt', encoding='utf-8')
-    fp.write("<?php header('location:sam',TRUE,301);")
+    fp.write("<?php header('location:sam/',TRUE,301);")
     fp.close()
     os.chown(indexPHP, 33, 33)
 
-print('Welcome to HIDCHE', flush=True)
+print('Welcome to HIDCHE')