Re-order check to create admin user

* If we can't create the user don't attempt to iterate over current users to see if admin user exists
ugns · Aug 16, 2018 · 79609cd · 79609cd
1 parent fc7aa7a
commit 79609cd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/master/init.groovy.d/configure-jenkins-admin.groovy b/master/init.groovy.d/configure-jenkins-admin.groovy
@@ -18,9 +18,9 @@ if (j.getAuthorizationStrategy().getClass() == AuthorizationStrategy.Unsecured)
 
 def adminUsername = System.getenv('JENKINS_ADMIN_USERNAME') ?: 'admin'
 def adminPassword = System.getenv('JENKINS_ADMIN_PASSWORD') ?: 'password'
-def currentUsers = j.getSecurityRealm().getAllUsers().collect { it.getId() }
-if (!(adminUsername in currentUsers)) {
-    if (j.getSecurityRealm().metaClass.respondsTo(j.getSecurityRealm(), 'createAccount', String, String)) {
+if (j.getSecurityRealm().metaClass.respondsTo(j.getSecurityRealm(), 'createAccount', String, String)) {
+  	def currentUsers = j.getSecurityRealm().getAllUsers().collect { it.getId() }
+    if (!(adminUsername in currentUsers)) {
         println("Created administrative user ${adminUsername}")
         def user = j.getSecurityRealm().createAccount(adminUsername, adminPassword)
         user.save