some changes with domain

This commit is contained in:
Artur Kuś 2025-09-08 14:21:15 +02:00
parent 228e684f52
commit 9641ef4a8c
1 changed files with 29 additions and 28 deletions

View File

@ -14,8 +14,10 @@ def domainsToCert = [
] ]
def createCert(domains) { def createCert(domains) {
echo "Server ENV = ${SERVER_ENV}" def baseCertPath = env.CERTS_PATH ?: '/_docker_data_/letsencrypt/live'
echo "Certbot image = ${CERTBOT_IMAGE}" def workDir = env.WORK_DIR ?: "/_sd_/_programs_/proxy-nginx/deploy-this/lets-encrypt"
def letsEncryptCommand = "docker compose --file lets-encrypt.yml --env-file lets.env"
def email = env.LETSENCRYPT_EMAIL ?: 'kusartur@gmail.com'
def toCreateDomains = [] def toCreateDomains = []
@ -27,7 +29,6 @@ def createCert(domains) {
def currentDomains = [] def currentDomains = []
def daysLeft = null def daysLeft = null
// Get existing certificate data if exists
if (fileExists(fileName)) { if (fileExists(fileName)) {
def certInfo = sh( def certInfo = sh(
script: "openssl x509 -in ${fileName} -text -noout | grep -o 'DNS:[^,]*' | sed 's/DNS://g'", script: "openssl x509 -in ${fileName} -text -noout | grep -o 'DNS:[^,]*' | sed 's/DNS://g'",
@ -38,22 +39,20 @@ def createCert(domains) {
currentDomains = certInfo.split('\n').collect { it.trim() } currentDomains = certInfo.split('\n').collect { it.trim() }
} }
// Calculate days until expiration
def expiryUnix = sh( def expiryUnix = sh(
script: "openssl x509 -enddate -noout -in ${fileName} | cut -d= -f2 | xargs -I{} date -d {} +%s", script: "openssl x509 -enddate -noout -in ${fileName} | cut -d= -f2 | xargs -I{} date -d {} +%s",
returnStdout: true returnStdout: true
).trim() ).trim()
if (expiryUnix.isNumber()) { if (expiryUnix?.isLong()) {
def nowUnix = sh(script: "date +%s", returnStdout: true).trim().toLong() def nowUnix = sh(script: "date +%s", returnStdout: true).trim().toLong()
daysLeft = (expiryUnix.toLong() - nowUnix) / (60 * 60 * 24) daysLeft = (expiryUnix.toLong() - nowUnix) / (60 * 60 * 24)
} }
} }
// Build expected domains list def subList = (domain.size() > 2) ? domain[2..-1] : []
def expectedDomains = [name] + domain[2..-1].collect { "${it}.${name}" } def expectedDomains = [name] + subList.collect { "${it}.${name}" }
// Check if certificate needs renewal
def needsRenewal = force || def needsRenewal = force ||
!fileExists(fileName) || !fileExists(fileName) ||
currentDomains.size() != expectedDomains.size() || currentDomains.size() != expectedDomains.size() ||
@ -61,7 +60,7 @@ def createCert(domains) {
(daysLeft != null && daysLeft < 30) (daysLeft != null && daysLeft < 30)
if (needsRenewal) { if (needsRenewal) {
echo "Certificate for '${name}' needs renewal (force: ${force}, missing domains: ${expectedDomains - currentDomains}, expires in: ${daysLeft ?: 'unknown'} days)" echo "Certificate for '${name}' needs renewal (force: ${force}, missing: ${expectedDomains - currentDomains}, expires in: ${daysLeft ?: 'unknown'} days)"
toCreateDomains.add(domain) toCreateDomains.add(domain)
} else { } else {
echo "Certificate for '${name}' is OK (expires in ${daysLeft} days)" echo "Certificate for '${name}' is OK (expires in ${daysLeft} days)"
@ -70,17 +69,14 @@ def createCert(domains) {
echo "Certificates to create/renew: ${toCreateDomains.collect { it[1] }}" echo "Certificates to create/renew: ${toCreateDomains.collect { it[1] }}"
if (toCreateDomains.isEmpty()) { if (!toCreateDomains.isEmpty()) {
echo "All certificates are up to date. Nothing to create/renew."
return
}
dir(workDir) { dir(workDir) {
for (domain in toCreateDomains) { for (domain in toCreateDomains) {
def name = domain[1] def name = domain[1]
def subDomains = domain[2..-1].collect { "-d ${it}.${name}" }.join(' ') def subList = (domain.size() > 2) ? domain[2..-1] : []
def subDomains = subList.collect { "-d ${it}.${name}" }.join(' ')
sh """ def cmd = """
${letsEncryptCommand} run --rm certbot certonly \ ${letsEncryptCommand} run --rm certbot certonly \
--webroot -w /var/www/certbot \ --webroot -w /var/www/certbot \
--cert-name='${name}' \ --cert-name='${name}' \
@ -88,10 +84,15 @@ def createCert(domains) {
--preferred-challenges http \ --preferred-challenges http \
--email ${email} \ --email ${email} \
-d ${name} ${subDomains} -d ${name} ${subDomains}
""" """.stripIndent()
sh(cmd)
} }
} }
} else {
echo "All certificates are up to date. Nothing to create/renew."
} }
}
pipeline { pipeline {
agent any agent any