refactor sonar properties

Author: Dan Rees

jobs/sonarqube/spec

@@ -10,10 +10,10 @@ templates:
   bin/sonarqube_ctl: bin/sonarqube_ctl
   bin/monit_debugger: bin/monit_debugger
   bin/pre-start: bin/pre-start
-  bin/post-deploy: bin/post-deploy
+  bin/post-deploy.erb: bin/post-deploy
   config/sonar.properties: config/sonar.properties
   config/configure-groups.groovy: config/configure-groups.groovy
-  config/configure-settings.groovy.erb: config/configure-settings.groovy
+  config/configure-settings.groovy: config/configure-settings.groovy
   config/group-permissions.json: config/group-permissions.json
   config/SonarApiClient.groovy.erb: config/SonarApiClient.groovy
   data/properties.sh.erb: data/properties.sh

jobs/sonarqube/templates/bin/post-deploy

@@ -5,6 +5,10 @@ class SonarApiClient
     static def sonarUrl = '<%= p('sonar.server.url') %>'
     static def sonarApiUrl = sonarUrl + '/api/'
 
+    static def gitHubUrl = '<%= p('github.server.url') if not defined? p('github.server.url') %>'
+    static def clientSecret = '<%= p('sonar.client.secret') if not defined? p('sonar.client.secret') %>'
+    static def clientId = '<%= p('sonar.client.id') if not defined? p('sonar.client.secret') %>'
+
     static def username = '<%= p('sonar.admin.username') %>'
     static def password = '<%= p('sonar.admin.password') %>'