Skip to content
Snippets Groups Projects
Commit 3923b0fe authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'task-1726-gitssh-extensions' into 'master'

Task 1726 gitssh extensions

See merge request !66
parents 7d62f479 6878585a
No related branches found
No related tags found
No related merge requests found
...@@ -121,12 +121,12 @@ switch (php_uname("n")) { ...@@ -121,12 +121,12 @@ switch (php_uname("n")) {
$aConfig['mirrorPackages'] = array( $aConfig['mirrorPackages'] = array(
'puppet' => array( 'puppet' => array(
'type' => 'rsync', 'type' => 'rsync',
'runas' => 'www-data', // nur fuer commandline 'runas' => '', // www-data', // nur fuer commandline
'target' => 'ladmin@calcium.iml.unibe.ch:/share/imldeployment', 'target' => 'ladmin@calcium.iml.unibe.ch:/share/imldeployment',
), ),
'puppet.one' => array( 'puppet.one' => array(
'type' => 'rsync', 'type' => 'rsync',
'runas' => 'www-data', // nur fuer commandline 'runas' => '', // www-data', // nur fuer commandline
'target' => 'copy-deployment@puppet.one.iml.unibe.ch:/var/shared/imldeployment', 'target' => 'copy-deployment@puppet.one.iml.unibe.ch:/var/shared/imldeployment',
), ),
); );
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
// http://iml:deployment@ci.iml.unibe.ch/deployment/?prj=ci&action=deploy&par3=preview&confirm=1 // http://iml:deployment@ci.iml.unibe.ch/deployment/?prj=ci&action=deploy&par3=preview&confirm=1
$sDocroot = (dirname(__dir__)) . "/public_html"; $sDocroot = (dirname(__dir__)) . "/public_html";
$processUser = posix_getpwuid(posix_geteuid());
if ($processUser['name']=="root"){
die("Do not start the script as user root\n");
};
require_once("$sDocroot/deployment/classes/logger.class.php"); require_once("$sDocroot/deployment/classes/logger.class.php");
global $oCLog; global $oCLog;
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
require_once(dirname(__DIR__)."/config/inc_projects_config.php"); require_once(dirname(__DIR__)."/config/inc_projects_config.php");
echo "\n========= SYNC archive files ==========\n"; echo "\n========= SYNC archive files ==========\n";
$processUser = posix_getpwuid(posix_geteuid());
if ($processUser['name']=="root"){
die("Do not start the script as user root\n");
};
if (array_key_exists('mirrorPackages', $aConfig) && count($aConfig['mirrorPackages']) ){ if (array_key_exists('mirrorPackages', $aConfig) && count($aConfig['mirrorPackages']) ){
foreach (array_keys($aConfig["phases"]) as $sPhase){ foreach (array_keys($aConfig["phases"]) as $sPhase){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment