correct [module/release] + projects json

This commit is contained in:
xdrm-brackets 2016-11-07 19:47:54 +01:00
parent 77026b81f3
commit 359d5412d5
2 changed files with 7 additions and 5 deletions

View File

@ -37,18 +37,18 @@
return ['ModuleError'=>ManagerError::UnreachableResource]; return ['ModuleError'=>ManagerError::UnreachableResource];
/* (2) Checks @project's folder */ /* (2) Checks @project's folder */
if( !is_dir($js[$project]['root']) ) if( !is_dir($js[$project]['git']) )
return ['ModuleError'=>ManagerError::UnreachableResource]; return ['ModuleError'=>ManagerError::UnreachableResource];
/* (3) Checks @git directory */ /* (3) Checks @git directory */
if( !is_dir($js[$project]['root'].'/.git') ) if( !is_dir($js[$project]['git'].'/.git') )
return ['ModuleError'=>ManagerError::UnreachableResource]; return ['ModuleError'=>ManagerError::UnreachableResource];
/* [3] Launch script /* [3] Launch script
=========================================================*/ =========================================================*/
/* (1) Launch command + test */ /* (1) Launch command + test */
$stdout = shell_exec('cd '.$js[$project]['root'].'; git pull origin '.$branch.';'); $stdout = shell_exec('cd '.$js[$project]['git'].'; git pull origin '.$branch.';');
/* (2) If error, raise error */ /* (2) If error, raise error */
if( is_null($stdout) ) if( is_null($stdout) )

View File

@ -1,10 +1,12 @@
{ {
"nxtic": { "nxtic": {
"root": "/var/www/nxtic" "apache": "/vhost/nxtic",
"git": "/vhost/git-repositories/nxtic"
}, },
"prod-releaser": { "prod-releaser": {
"root": "/var/www/prod-releaser" "apache": "/vhost/prod-releaser",
"git": "/vhost/git-repositories/prod-release.php"
} }
} }