Merge pull request #172 from dazjones/property-move

Moved github properties to reside under jenkins

Author: Darren Jones

ci/manifests/jenkins.yml

@@ -7,19 +7,6 @@ instance_groups:
   - name: jenkins-master
     release: devtools
     properties:
-      github:
-        oauth:
-          org_name: ((github_oauth_org_name))
-          admins:
-          user1: ((jenkins_oauth_admin_user_1))
-          admin2: ((jenkins_oauth_admin_user_2))
-          admin3: ((jenkins_oauth_admin_user_3))
-          url:
-            web: ((jenkins_oauth_github_web_ui))
-            api: ((jenkins_oauth_github_api_ui))
-          client:
-            id: ((jenkins_oauth_clientID))
-            secret: ((jenkins_oauth_clientSecret))
       jenkins:
         admin:
           email: admin@localhost
@@ -28,6 +15,19 @@ instance_groups:
           password: ((jenkins_agent_password))
         server:
           address: http://localhost:8080/
+        github:
+          oauth:
+            org_name: ((github_oauth_org_name))
+            admins:
+              user1: ((jenkins_oauth_admin_user_1))
+              admin2: ((jenkins_oauth_admin_user_2))
+              admin3: ((jenkins_oauth_admin_user_3))
+            url:
+              web: ((jenkins_oauth_github_web_ui))
+              api: ((jenkins_oauth_github_api_ui))
+            client:
+              id: ((jenkins_oauth_clientID))
+              secret: ((jenkins_oauth_clientSecret))
   networks:
   - name: default
   persistent_disk_pool: 10GB

jobs/jenkins-master/templates/config/config.xml.erb

@@ -10,12 +10,12 @@
   <authorizationStrategy class="org.jenkinsci.plugins.GithubAuthorizationStrategy" plugin="[email protected]">
     <rootACL>
       <organizationNameList class="linked-list">
-        <string><%= p('github.oauth.org_name')  %></string>
+        <string><%= p('jenkins.github.oauth.org_name')  %></string>
       </organizationNameList>
       <adminUserNameList class="linked-list">
-        <string><%= p('github.oauth.admin.user1') %></string>
-        <string><%= p('github.oauth.admin.user2') %></string>
-        <string><%= p('github.oauth.admin.user3') %></string>
+        <string><%= p('jenkins.github.oauth.admin.user1') %></string>
+        <string><%= p('jenkins.github.oauth.admin.user2') %></string>
+        <string><%= p('jenkins.github.oauth.admin.user3') %></string>
       </adminUserNameList>
       <authenticatedUserReadPermission>false</authenticatedUserReadPermission>
       <useRepositoryPermissions>false</useRepositoryPermissions>
@@ -27,10 +27,10 @@
     </rootACL>
   </authorizationStrategy>
   <securityRealm class="org.jenkinsci.plugins.GithubSecurityRealm">
-    <githubWebUri><%= p('github.oauth.url.web') %></githubWebUri>
-    <githubApiUri><%= p('github.oauth.url.api') %></githubApiUri>
-    <clientID><%= p('github.oauth.client.id') %></clientID>
-    <clientSecret><%= p('github.oauth.client.secret') %></clientSecret>
+    <githubWebUri><%= p('jenkins.github.oauth.url.web') %></githubWebUri>
+    <githubApiUri><%= p('jenkins.github.oauth.url.api') %></githubApiUri>
+    <clientID><%= p('jenkins.github.oauth.client.id') %></clientID>
+    <clientSecret><%= p('jenkins.github.oauth.client.secret') %></clientSecret>
     <oauthScopes>read:org,user:email</oauthScopes>
   </securityRealm>
   <disableRememberMe>true</disableRememberMe>