[ssl_mgmt] Only overwrite openssl.cnf when ready

This commit is contained in:
Thomas Preud'homme 2014-03-09 17:57:35 +08:00
parent b080b227a2
commit 6a92f1c01c
1 changed files with 4 additions and 5 deletions

View File

@ -188,18 +188,17 @@ generate_config ()
replaceCmd="$(add_to_replace_cmd "$replaceCmd" "@COUNTRY@" "${country:-}")"
replaceCmd="$(add_to_replace_cmd "$replaceCmd" "@COMMONNAME@" "${commonName:-}")"
replaceCmd="$(add_to_replace_cmd "$replaceCmd" "@ALTNAME@" "${altName:-}")"
sed "$replaceCmd" $confFile.in > $confFile
cnfTmpFile="$(mktemp --tmpdir=. openssl.cnf.XXXXXXXXXX)"
sed "$replaceCmd" $confFile.in > $cnfTmpFile
if ask_user_default_no "Do you want to edit the openssl configuration file?"
then
if [ -n "${EDITOR:-}" ]
then
$EDITOR $confFile
$EDITOR $cnfTmpFile
else
editor $confFile
editor $cnfTmpFile
fi
fi
cnfTmpFile="$(mktemp --tmpdir=. openssl.cnf.XXXXXXXXXX)"
mv $confFile $cnfTmpFile
grep -v "@[A-Z]\+@" $cnfTmpFile > $confFile
rm $cnfTmpFile
}