diff --git a/config/config_custom.php.dist b/config/config_custom.php.dist index 1fe05628fde107d3556cd92e2586e98c10aa8794..7b67a202d00acf49fe30daa8531e28b951ceba9f 100644 --- a/config/config_custom.php.dist +++ b/config/config_custom.php.dist @@ -39,51 +39,47 @@ return [ 'ip'=> ['127.0.0.1'], ], - 'projectgroups' => array( - 'aae'=>'AAE', - 'aum'=>'AUM', - 'eosce'=>'EOSCE', - 'iml'=>'IML Services and websites', - 'measured'=>'Measured', - 'medsurf'=>'Medsurf', - ), + 'projectgroups' => [ + 'teamA'=>'Team A: Services', + 'teamB'=>'Team B: Website', + ], // ---------------------------------------------------------------------- // build settings // ---------------------------------------------------------------------- 'versionsToKeep' => 10, // for cleanup: keep n unused versions 'builtsToKeep' => 3, - 'build' => array( + 'build' => [ 'env' => 'export RVMSCRIPT="/usr/local/rvm/scripts/rvm";', - 'hooks' => array( + 'hooks' => [ 'build-postclone' => 'hooks/onbuild-postclone', 'build-precompress' => 'hooks/onbuild', - ), - ), + ], + ], // ---------------------------------------------------------------------- // rsync of archives // ---------------------------------------------------------------------- - 'mirrorPackages' => array( + 'mirrorPackages' => [ /* // (1) // sync to a puppet master puppet to extract archive and generate templates - 'puppet' => array( + 'puppet' => [ 'type' => 'rsync', 'runas' => '', // www-data, // nur fuer commandline 'target' => 'copy-deployment@puppetmaster.example.com:/share/ciserver', - ), + ], // (2) // sync to a software package server like https://os-docs.iml.unibe.ch/ci-pkg/ - 'package-server' => array( + 'package-server' => [ 'type' => 'rsync', 'runas' => '', // www-data, // nur fuer commandline 'target' => 'copy-deployment@software.example.com:/var/www/data-ciserver', - ), + ], */ - ), + ], // ---------------------------------------------------------------------- // plugins @@ -116,20 +112,20 @@ return [ // ---------------------------------------------------------------------- // notifications to messengers ... - 'messenger'=>array( - 'slack'=>array( - 'presets'=>array( - 'https://hooks.slack.com/services/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'=>array( + 'messenger'=>[ + 'slack'=>[ + 'presets'=>[ + 'https://hooks.slack.com/services/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'=>[ 'label'=>'#medsurf-heartbeat', 'user'=>'[CI-WebGUI]', - ), - 'https://hooks.slack.com/services/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'=>array( + ], + 'https://hooks.slack.com/services/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'=>[ 'label'=>'#msrd-analyzer-hrtbeat', 'user'=>'[CI-WebGUI]', - ), - ), - ), - ), + ], + ], + ], + ], // ---------------------------------------------------------------------- ]; \ No newline at end of file diff --git a/config/inc_projects_config.php b/config/inc_projects_config.php index 83c949ba32886282bda76006e0b13b95ef39c140..1d979444e6ea490394ba96c0ae6156f269a9d365 100644 --- a/config/inc_projects_config.php +++ b/config/inc_projects_config.php @@ -12,7 +12,7 @@ if (file_exists('config_custom.php')){ // generate some vars // ---------------------------------------------------------------------- -$aConfig = array_merge($aConfig, array( +$aConfig = array_merge($aConfig, [ 'appRootDir' => dirname(dirname(__FILE__)), 'configDir' => dirname(__FILE__), 'dataDir' => $aConfig['workDir'] . '/data', // to write data: ssh keys, projects, database @@ -20,4 +20,4 @@ $aConfig = array_merge($aConfig, array( 'buildDefaultsDir' => $aConfig['workDir'] . '/defaults', 'packageDir' => $aConfig['workDir'] . '/packages', 'archiveDir' => $aConfig['workDir'] . '/packages/_files', -)); +]);