[ssl_mgmt] Change default to sane values

Now that our installation was migrating to saner places, change default
values.
This commit is contained in:
Thomas Preud'homme 2014-05-04 22:32:44 +08:00
parent 92962f6168
commit 7510335e26
1 changed files with 12 additions and 3 deletions

View File

@ -135,7 +135,7 @@ set_variables ()
. $cnfFilePath
workDir=${workDir:-/usr/lib/ssl/CA}
workDir=${workDir:-${0%/*/*}/lib/${0##*/}}
csrSubdir=${csrSubdir:-csr}
certSubdir=${certSubdir:-newcerts}
keySubdir=${keySubdir:-newkeys}
@ -144,8 +144,12 @@ set_variables ()
CACertPath=${CACertPath:-$certDestDir/ca-cert.pem}
CAKeyPath=${CAKeyPath:-$keyDestDir/ca-key.pem}
opensslCnfFile=openssl.cnf
rootCAPwdPath=${rootCAPwdPath:-/root/passwords/root_ca}
managedCerts=${managedCerts:-$(xargs </root/homemade-certs)}
if [ -z "${rootCAPwdPath:-}" ]
then
echo -n "You must set rootCAPwdPath to the file containing" >&2
echo " the root CA password"
fi
managedCerts=${managedCerts:-}
notifiedUsers=${notifiedUsers:-}
notifySubject=${notifySubject:-'New fingerprint for service $service'}
if [ -z "${notifyTemplate:-}" ]
@ -330,6 +334,11 @@ main ()
cd $workDir
if [ "${service}" = "all" ]
then
if [ -z "$managedCerts" ]
then
echo -n "You need to set managedCerts for renew" >&2
echo " all to work"
fi
exit_if_no_access "$managedCerts" "READ"
services=""
for service in $managedCerts