aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2013-12-03 17:52:18 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2013-12-03 17:52:18 +0200
commit8e8912e312dc59268e318f070c13f73f55cd0bfe (patch)
tree4981d8aae2bf65fc0410c81516ac84fd644bbf95
parentd54600c8e8ae63f46a77af3643bb0b70b79fad6f (diff)
Switch to use "jenkins-admins" group for admin auth. This requires nested groups.
-rw-r--r--ansible-deploy/roles/jenkins/templates/jenkins-config/config.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible-deploy/roles/jenkins/templates/jenkins-config/config.xml b/ansible-deploy/roles/jenkins/templates/jenkins-config/config.xml
index 5cf8ea0..6a738dc 100644
--- a/ansible-deploy/roles/jenkins/templates/jenkins-config/config.xml
+++ b/ansible-deploy/roles/jenkins/templates/jenkins-config/config.xml
@@ -6,7 +6,7 @@
<useSecurity>true</useSecurity>
<authorizationStrategy class="hudson.security.ProjectMatrixAuthorizationStrategy">
<permission>hudson.model.Hudson.Administer:admin</permission>
- <permission>hudson.model.Hudson.Administer:infrastructure</permission>
+ <permission>hudson.model.Hudson.Administer:jenkins-admins</permission>
<permission>hudson.model.Hudson.Read:anonymous</permission>
<permission>hudson.model.Item.Read:anonymous</permission>
{% include jenkins_extra_users %}
@@ -22,7 +22,7 @@
<applicationName>{{crowd_user}}</applicationName>
<password>{{crowd_passwd}}</password>
<group>linaro-login-users</group>
- <nestedGroups>false</nestedGroups>
+ <nestedGroups>true</nestedGroups>
<useSSO>false</useSSO>
<sessionValidationInterval>10</sessionValidationInterval>
</securityRealm>