removed oauth config

Author: Darren Jones

jobs/jenkins-master/spec

@@ -20,7 +20,6 @@ templates:
   bin/restore.sh.erb: bin/bbr/restore
   config/branding.css.erb: config/branding.css
   config/config.xml.erb: config/config.xml
-  config/config-oauth.xml.erb: config/config-oauth.xml
   config/configure-access.groovy.erb: init.groovy.d/configure-access.groovy
   config/configure-github-access.groovy.erb: init.groovy.d/configure-github-access.groovy
   config/configure-master-access-control.groovy.erb: init.groovy.d/configure-master-access-control.groovy
@@ -66,6 +65,6 @@ properties:
   jenkins.github.oauth.client.secret:
     description: "Github client.secret"
     default: "placeholder_client_secret"
-  jenkins.config:
-    description: "Jenkins config xml"
-    default: "config.xml"
+  jenkins.use_github_auth:
+    description: "Jenkins github auth"
+    default: "false"

jobs/jenkins-master/templates/bin/pre-start.erb

@@ -7,26 +7,21 @@ mkdir -p /var/vcap/store/jenkins-master
 mkdir -p /var/vcap/store/jenkins-master/init.groovy.d
 mkdir -p /var/vcap/store/jenkins-master/plugins
 
-JENKINS_CONFIG="<%= p('jenkins.config') %>"
+JENKINS_USE_GITHUB_AUTH="<%= p('jenkins.use_github_auth') %>"
 
 if [[ $(ls /var/vcap/jobs/jenkins-master/config/*.xml) ]]; then
     echo "Copying Config..."
     cp /var/vcap/jobs/jenkins-master/config/*.xml /var/vcap/store/jenkins-master
 fi
 
-if [ ${JENKINS_CONFIG} != "config.xml" ]; then
-    cp /var/vcap/jobs/jenkins-master/config/${JENKINS_CONFIG} /var/vcap/store/jenkins-master/config.xml
-fi
-
 if [[ $(ls /var/vcap/jobs/jenkins-master/init.groovy.d/*.groovy) ]]; then
     echo "Copying Groovy..."
     cp /var/vcap/jobs/jenkins-master/init.groovy.d/*.groovy /var/vcap/store/jenkins-master/init.groovy.d/
     # We want standard Jenkins managed access unless defined
     rm /var/vcap/store/jenkins-master/init.groovy.d/configure-github-access.groovy
 fi
 
-if [ ${JENKINS_CONFIG} == "config-oauth.xml" ]; then
-    # This is temporary until we use this groovy script to construct the config
+if [ ${JENKINS_USE_GITHUB_AUTH} == "true" ]; then
     rm /var/vcap/store/jenkins-master/init.d/configure-access.groovy
     cp /var/vcap/jobs/jenkins-master/init.groovy.d/configure-github-access.groovy /var/vcap/store/jenkins-master/init.groovy.d/configure-github-access.groovy
 fi