이미지 동기화 키 추가

This commit is contained in:
2019-09-22 17:06:53 +00:00
parent b1205edd48
commit 5c5356f3d5
3 changed files with 16 additions and 8 deletions
+14 -2
View File
@@ -60,6 +60,11 @@ 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,
@@ -69,6 +74,7 @@ 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'],
})
@@ -93,10 +99,16 @@ print(loginResult.text, flush=True)
serverList = str(env['HIDCHE_SERVER_LIST']).split(',')
serverList.reverse()
for serverName in serverList:
currentBranch = 'devel'
for idx, serverName in enumerate(serverList):
if idx == 0:
target = currentBranch
else:
target = 'origin/'+currentBranch
updateResult = session.post('http://web/sam/j_updateServer.php', {
'server':serverName,
'target':'origin/devel'
'target':target
})
print(serverName, updateResult.text, flush=True)