viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make sure both LE dns records get cleaned up after finish

Browse source
This commit is contained in:
viktorbarzin 2021-02-16 23:00:35 +00:00
parent 1f048a4a16
commit 403afc86e9
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/kubernetes/setup_tls_secret/renew.sh
View file

@ -34,22 +34,22 @@ send -- "\r"
# Do the same for the 2nd dns record # Do the same for the 2nd dns record
expect -re "Before continuing, verify" { expect -re "Before continuing, verify" {
set challenge [ exec sh -c "echo '$expect_out(buffer)' | tail -n 3 | head -n 1" ] set challenge [ exec sh -c "echo '$expect_out(buffer)' | tail -n 3 | head -n 1" ]
set dns_record "_acme-challenge IN TXT \"$challenge\"" set dns_record1 "_acme-challenge IN TXT \"$challenge\""
puts $dns_record puts $dns_record1
puts $dns_file puts $dns_file
# Check if dns record is not already present # Check if dns record is not already present
try { try {
set results [exec grep -q $dns_record $dns_file] set results [exec grep -q $dns_record1 $dns_file]
set status 0 set status 0
} trap CHILDSTATUS {results options} { } trap CHILDSTATUS {results options} {
set status [lindex [dict get $options -errorcode] 2] set status [lindex [dict get $options -errorcode] 2]
} }
if {$status != 0} { if {$status != 0} {
exec echo $dns_record | tee -a $dns_file exec echo $dns_record1 | tee -a $dns_file
puts "Teed into file" puts "Teed into file"
} else { } else {
puts "DNS record '$dns_record' already in file" puts "DNS record '$dns_record1' already in file"
} }
} }
@ -68,6 +68,7 @@ send -- "\r"
# Clean up # Clean up
exec sed -i "s/$dns_record//g" "$dns_file" exec sed -i "s/$dns_record//g" "$dns_file"
exec sed -i "s/$dns_record1//g" "$dns_file"
# Success # Success
expect ".*Congratulations!" expect ".*Congratulations!"