From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Mon, 30 Mar 2009 20:10:52 +0000 (+0000)
Subject: Skip services that aren't enabled.
X-Git-Tag: MyPLC-4.3-5~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3e4097cba172ad5ebc9a2f45075cca5abdd01375;p=myplc.git

Skip services that aren't enabled.
---

diff --git a/plc.d/ssl b/plc.d/ssl
index a9d22c7..edf451f 100755
--- a/plc.d/ssl
+++ b/plc.d/ssl
@@ -73,15 +73,23 @@ verify_or_generate_certificate() {
 
 case "$1" in
     start)
-	MESSAGE=$"Generating SSL certificates"
-	dialog "$MESSAGE"
 
 	# Generate HTTPS certificates if necessary. We generate a
 	# certificate for each enabled server with a different
 	# hostname. These self-signed certificates may be overridden
 	# later.
+        MESSAGE=$"Generating SSL certificates for"
+        dialog "$MESSAGE"
+
 	for server in WWW API BOOT ; do
-	    ssl_key=PLC_${server}_SSL_KEY
+	    eval "a=\$PLC_${server}_ENABLED"
+            echo $a
+            if [ "$a" -ne 1 ] ; then
+		echo "Skipping"
+                continue
+            fi
+	    dialog "$server"
+        ssl_key=PLC_${server}_SSL_KEY
 	    ssl_crt=PLC_${server}_SSL_CRT
 	    ca_ssl_crt=PLC_${server}_CA_SSL_CRT
 	    hostname=PLC_${server}_HOST