Merge pull request #169 from dazjones/property-refactor

refactored properties

Author: Darren Jones

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

@@ -10,12 +10,12 @@
   <authorizationStrategy class="org.jenkinsci.plugins.GithubAuthorizationStrategy" plugin="github-oauth@0.29">
     <rootACL>
       <organizationNameList class="linked-list">
-        <string><%= p('github.oauth.org-name')  %></string>
+        <string><%= p('github.oauth.org_name')  %></string>
       </organizationNameList>
       <adminUserNameList class="linked-list">
-        <string><%= p('github.oauth.admin-user-1') %></string>
-        <string><%= p('github.oauth.admin-user-2') %></string>
-        <string><%= p('github.oauth.admin-user-3') %></string>
+        <string><%= p('github.oauth.admin.user1') %></string>
+        <string><%= p('github.oauth.admin.user2') %></string>
+        <string><%= p('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.web-ui') %></githubWebUri>
-    <githubApiUri><%= p('github.oauth.api-ui') %></githubApiUri>
-    <clientID><%= p('github.oauth.clientID') %></clientID>
-    <clientSecret><%= p('github.oauth.clientSecret') %></clientSecret>
+    <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>
     <oauthScopes>read:org,user:email</oauthScopes>
   </securityRealm>
   <disableRememberMe>true</disableRememberMe>

manifests/buildstack.yml

@@ -7,14 +7,17 @@ instance_groups:
     properties:
       github:
         oauth:
-          org-name: ((github-oauth-org-name))
-          admin-user-1: ((jenkins-oauth-admin-user-1))
-          admin-user-2: ((jenkins-oauth-admin-user-2))
-          admin-user-3: ((jenkins-oauth-admin-user-3))
-          web-ui: ((jenkins-oauth-github-web-ui))
-          api-ui: ((jenkins-oauth-github-api-ui))
-          clientID: ((jenkins-oauth-clientID))
-          clientSecret: ((jenkins-oauth-clientSecret))
+          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