From 7510335e26f141d6eccdf32a4e474c160331271a Mon Sep 17 00:00:00 2001
From: Thomas Preud'homme <robotux@celest.fr>
Date: Sun, 4 May 2014 22:32:44 +0800
Subject: [PATCH] [ssl_mgmt] Change default to sane values

Now that our installation was migrating to saner places, change default
values.
---
 ssl_mgmt/ssl_mgmt | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ssl_mgmt/ssl_mgmt b/ssl_mgmt/ssl_mgmt
index 1153a9a..99e73e1 100755
--- a/ssl_mgmt/ssl_mgmt
+++ b/ssl_mgmt/ssl_mgmt
@@ -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