debug

OFFICERenewalWildcardJenkinsfile

@@ -4,7 +4,7 @@ NEW_ENDDATE = ''
 BACKUP_FILE = ''
 CONFIG_DIR = ''
 COMMAND = ''
-TARGET_HOSTS_APACHE = [ 'pbx', 'sugar', 'owncloud' ]
+TARGET_HOSTS_APACHE = [ 'sugar', 'owncloud' ]
 pipeline {
   agent {
     label "swarm"
@@ -89,8 +89,10 @@ pipeline {
               echo "Update certificate and key for ${item}"
               def PLAYBOOK = PKI_GIT_NAME + '/' + DOMAIN + '/wildcard/acme-dns/' + 'apache.yml'
               def TARGET_HOST = item + '.' + DOMAIN
-//              update_sertificate(PLAYBOOK, CONFIG_DIR, TARGET_HOST)
-              ap(PLAYBOOK, CONFIG_DIR, TARGET_HOST)
+              def DOT_DOMAIN = '.' + DOMAIN
+              def TARGET_DIR = WORKSPACE + '/' + CONFIG_DIR
+              update_sertificate(PLAYBOOK, TARGET_DIR, TARGET_HOST, DOT_DOMAIN)
+//              ap(PLAYBOOK, TARGET_DIR, TARGET_HOST, DOT_DOMAIN)
             }
           }
 /*          ENDDATE = sh (script: "echo|openssl s_client -servername ${SMTP_SERVER} -connect ${SMTP_SERVER} 2>/dev/null|openssl x509 -noout -enddate", returnStdout: true).trim()
@@ -143,7 +145,7 @@ def update_secret(String NODE_IP, String SWARM_GIT_NAME, String DOMAIN, String C
             docker stack deploy -c ${SWARM_GIT_NAME}/proxy.yml proxy
          """
 }
-def update_sertificate(String PLAYBOOK, String TARGET_DIR, String TARGET_HOST) {
+def update_sertificate(String PLAYBOOK, String TARGET_DIR, String TARGET_HOST, String DOMAIN) {
       withCredentials([sshUserPrivateKey(credentialsId: 'ansible', keyFileVariable: 'GIT_SSH_KEY', passphraseVariable: '', usernameVariable: 'GIT_SSH_USERNAME')]) {
         ansiColor('xterm') {
           ansiblePlaybook(
@@ -153,6 +155,7 @@ def update_sertificate(String PLAYBOOK, String TARGET_DIR, String TARGET_HOST) {
             extraVars: [
               target_dir: TARGET_DIR,
               TARGET_HOST: TARGET_HOST
+              domain: DOMAIN
             ],
             extras: '-vvv',
             colorized: true)