diff --git a/config/config_defaults.php b/config/config_defaults.php index e500f6e0aff3a5b02f41e9c88d087b80422ef2a5..2b9906ebd3eafc9a12dd83b7036f518932b0b021 100644 --- a/config/config_defaults.php +++ b/config/config_defaults.php @@ -72,18 +72,18 @@ return [ // ---------------------------------------------------------------------- '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', - ), - ), + ], + ], // ---------------------------------------------------------------------- // sync of archives // ---------------------------------------------------------------------- - 'mirrorPackages' => array( + 'mirrorPackages' => [ /* // (1) @@ -102,7 +102,7 @@ return [ 'target' => 'copy-deployment@software.example.com:/var/www/data-ciserver', ), */ - ), + ], // ---------------------------------------------------------------------- // plugins @@ -146,23 +146,23 @@ return [ // TODO: functionality to be removed?! // ---------------------------------------------------------------------- - 'foreman' => array( + 'foreman__' => [ 'api'=>'https://foreman.example.com/', // with ending "/" 'user'=>'ci-server', 'password'=>'ciserver_password_here', 'ignore-ssl-error'=>true, // 'varname-replace'=>'ci-replacement', - ), + ], // where to store project data - 'projects' => array( - 'json' => array( + 'projects' => [ + 'json' => [ 'active' => true, - ), - 'ldap' => array( + ], + 'ldap' => [ 'active' => false, - ), - ), + ], + ], // ---------------------------------------------------------------------- ]; \ No newline at end of file diff --git a/config/inc_roles.php b/config/inc_roles.php index 0db2b60f59aada087f0410e4b0911cda63fc0c10..58188673f6878d3872b87e68dfc54c3cdbb2c7e9 100644 --- a/config/inc_roles.php +++ b/config/inc_roles.php @@ -7,11 +7,11 @@ * */ -return array( - "all" => array( +return [ + "all" => [ "page_login" - ), - "authenticated" => array( + ], + "authenticated" => [ "page_overview", "page_accept", @@ -34,10 +34,10 @@ return array( "project-action-overview", "project-action-phase", "project-action-setup", - ), + ], - "admin" => array( + "admin" => [ "page_accept", "page_build", @@ -63,16 +63,16 @@ return array( "project-action-phase", "project-action-setup", "project-action-setup-edit-replacements", - ), + ], // ----- wenn es mal eine feinere Granulierung braucht, muss man eine // User-Admin programmieren /* - "authenticated_" => array( + "authenticated_" => [ "page_overview", - ), - "developer_" => array( + ], + "developer_" => [ "page_build", "page_cleanup", "page_setup", @@ -85,15 +85,15 @@ return array( "project-action-overview", "project-action-phase", "project-action-setup", - ), - "projectmanager_" => array( + ], + "projectmanager_" => [ "project-action-default", "project-action-accept-preview", "project-action-accept-stage", // "project-action-deploy", "project-action-overview", "project-action-phase", - ), + ], */ -); +];