서버 버전 추가

This commit is contained in:
2018-04-01 03:55:28 +09:00
parent dbc877023b
commit 3eb0f22439
3 changed files with 41 additions and 5 deletions
+2
View File
@@ -0,0 +1,2 @@
RedirectMatch 404 /\.git
RedirectMatch 404 /\.gitignore
+8
View File
@@ -0,0 +1,8 @@
<?php
namespace sammo;
class VersionGit{
public static $version = '_tK_verionGit_';
private function __construct(){}
}
+31 -5
View File
@@ -3,6 +3,21 @@ namespace sammo;
require('_common.php'); require('_common.php');
function getVersion($target=null){
if($target){
$command = sprintf('git describe %s --long --tags', escapeshellarg($target));
}
else{
$command = 'git describe --long --tags';
}
exec($command, $output);
if(is_array($output)){
$output = join('', $output);
}
return trim($output);
}
$session = Session::requireLogin(null)->setReadOnly(); $session = Session::requireLogin(null)->setReadOnly();
if($session->userGrade < 6){ if($session->userGrade < 6){
Json::die([ Json::die([
@@ -67,7 +82,6 @@ if(!file_exists($server)){
if($server == $baseServerName){ if($server == $baseServerName){
exec("git pull 2>&1", $output); exec("git pull 2>&1", $output);
if($output && $output[0] != 'Already up-to-date.'){ if($output && $output[0] != 'Already up-to-date.'){
Json::die([ Json::die([
@@ -76,10 +90,17 @@ if($server == $baseServerName){
]); ]);
} }
//TODO: 버전명을 기록. $version = getVersion();
$result = Util::generateFileUsingSimpleTemplate(
__DIR__.'/'.$server.'/d_setting/VersionGit.orig.php',
__DIR__.'/'.$server.'/d_setting/VersionGit.php',[
'verionGit'=>$version
], true
);
Json::die([ Json::die([
'result'=>true, 'result'=>true,
'version'=>$version
]); ]);
} }
@@ -118,10 +139,15 @@ if(!$zip->extractTo($server)){
$zip->close(); $zip->close();
@unlink($tmpFile); @unlink($tmpFile);
$version = getVersion();
$result = Util::generateFileUsingSimpleTemplate(
//TODO: 버전명을 기록. __DIR__.'/'.$server.'/d_setting/VersionGit.orig.php',
__DIR__.'/'.$server.'/d_setting/VersionGit.php',[
'verionGit'=>$version
], true
);
Json::die([ Json::die([
'result'=>true, 'result'=>true,
'version'=>$version
]); ]);