close #1 Solve #153 from Praqma/JenkinsAsCodeReference

Author: Ewelina Wilkosz

dockerizeit/master/globalconfig.groovy

@@ -46,15 +46,17 @@ desc.setGlobalConfigEmail(properties.global.git.email)
 
 if(properties.global.smtp.enabled) {
   println "--> Set E-mail Notification"
-  File pwdFile = new File(properties.credentials.smtp.path)
-  if(!pwdFile.exists()) {
-    println "Smpt password file missing!"
-  } else {
-    def emailDesc = inst.getDescriptor(hudson.tasks.Mailer)
-    emailDesc.setSmtpHost(properties.global.smtp.host)
-    emailDesc.setSmtpPort(properties.global.smtp.port)
-    emailDesc.setSmtpAuth(properties.credentials.smtp.userId, new File(properties.credentials.smtp.path).text.trim())
-    emailDesc.setReplyToAddress(properties.global.smtp.reply_to_address)  
+  if(properties.global.smtp.authentication.enabled) {
+    File pwdFile = new File(properties.global.smtp.authentication.passwordFile)
+    if(!pwdFile.exists()) {
+      println "Smpt password file missing!"
+    } else {
+      def emailDesc = inst.getDescriptor(hudson.tasks.Mailer)
+      emailDesc.setSmtpHost(properties.global.smtp.host)
+      emailDesc.setSmtpPort(properties.global.smtp.port)
+      emailDesc.setSmtpAuth(properties.global.smtp.authentication.login, pwdFile.text.trim())
+      emailDesc.setReplyToAddress(properties.global.smtp.reply_to_address)  
+    }
   }
 }
 

dockerizeit/master/jenkins.properties

@@ -14,13 +14,6 @@ credentials {
     description = ""
     path = "/var/jenkins_home/.ssh/.password"
   }
-  smtp {
-    type = "password"
-    userId = "jenkins"
-    credentialsId = "smtp"
-    description = "Used by jenkins to send mail notifications"
-    path = "/var/jenkins_home/.ssh/.smtp_password"
-  }
 }
 
 registry {
@@ -82,6 +75,11 @@ global {
     port = "25"
     host = "1.1.1.1"
     reply_to_address = "[email protected]"
+    authentication {
+      enabled = true
+      login = "jenkins"
+      passwordFile = "/var/jenkins_home/.ssh/.smtp_password"
+   }
   }
 }