Merge pull request #193 from dazjones/config-access

Remove configure access when oauth config is used

Author: Darren Jones

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

@@ -12,7 +12,6 @@ JENKINS_CONFIG="<%= p('jenkins.config') %>"
 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
@@ -24,6 +23,11 @@ if [[ $(ls /var/vcap/jobs/jenkins-master/init.groovy.d/*.groovy) ]]; then
     cp /var/vcap/jobs/jenkins-master/init.groovy.d/*.groovy /var/vcap/store/jenkins-master/init.groovy.d/
 fi
 
+if [ ${JENKINS_CONFIG} == "config-oauth.xml" ]; then
+    # This is temporary until we use this groovy script to construct the config
+    rm /var/vcap/store/jenkins-master/init.d/configure-access.groovy
+fi
+
 echo "Configuring Plugins..."
 unzip -o /var/vcap/jobs/jenkins-master/packages/jenkins/jenkins/plugins-*.zip -d /var/vcap/store/jenkins-master/plugins
 # add disabled plugin list