Praveen K Paladugu f23808c
diff -up ./etc/init/openwsmand.sh.in.old ./etc/init/openwsmand.sh.in
Praveen K Paladugu f23808c
--- ./etc/init/openwsmand.sh.in.old	2010-08-04 16:43:40.212100948 -0500
Praveen K Paladugu f23808c
+++ ./etc/init/openwsmand.sh.in	2010-08-04 17:26:20.013849220 -0500
c8234dd
@@ -4,15 +4,15 @@
srinivas ramanatha 702dc6c
 # Provides: openwsmand
srinivas ramanatha 702dc6c
 # Required-Start: $remote_fs
srinivas ramanatha 702dc6c
 # Required-Stop: $network
srinivas ramanatha 702dc6c
-# Default-Start: 2 3 4 5
srinivas ramanatha 702dc6c
-# Default-Stop: 0 1 6 
c8234dd
+# Default-Start:
c8234dd
+# Default-Stop:
srinivas ramanatha 702dc6c
 # Short-Description: Openwsman Daemon
srinivas ramanatha 702dc6c
 # Description: openwsmand
srinivas ramanatha 702dc6c
 #       Start/Stop the Openwsman Daemon
srinivas ramanatha 702dc6c
 ### END INIT INFO
srinivas ramanatha 702dc6c
 #
srinivas ramanatha 702dc6c
 #
srinivas ramanatha 702dc6c
-# chkconfig: 2345 36 64
srinivas ramanatha 702dc6c
+# chkconfig: - 36 64
srinivas ramanatha 702dc6c
 # description: Openwsman Daemon
srinivas ramanatha 702dc6c
 # processname: openwsmand
srinivas ramanatha 702dc6c
 
Praveen K Paladugu f23808c
@@ -56,20 +56,16 @@ start()
Praveen K Paladugu f23808c
 	echo "Using common server certificate /etc/ssl/servercerts/servercert.pem"
Praveen K Paladugu f23808c
 	ln -s /etc/ssl/servercerts/server{cert,key}.pem @SYSCONFDIR@
Praveen K Paladugu f23808c
       else
Praveen K Paladugu f23808c
-        echo "Generating Openwsman server public certificate and private key"
Praveen K Paladugu f23808c
-	FQDN=`hostname --fqdn`
Praveen K Paladugu f23808c
-	if [ "x${FQDN}" = "x" ]; then
Praveen K Paladugu f23808c
-	  FQDN=localhost.localdomain
Praveen K Paladugu f23808c
-	fi
srinivas ramanatha 702dc6c
-cat << EOF | sh @SYSCONFDIR@/owsmangencert.sh > /dev/null 2>&1
Praveen K Paladugu f23808c
---
Praveen K Paladugu f23808c
-SomeState
Praveen K Paladugu f23808c
-SomeCity
Praveen K Paladugu f23808c
-SomeOrganization
Praveen K Paladugu f23808c
-SomeOrganizationalUnit
Praveen K Paladugu f23808c
-${FQDN}
Praveen K Paladugu f23808c
-root@${FQDN}
Praveen K Paladugu f23808c
-EOF
Praveen K Paladugu f23808c
+	echo "FAILED: Starting openwsman server"
Praveen K Paladugu f23808c
+        echo "There is no ssl server key available for openwsman server to use."
Praveen K Paladugu f23808c
+	echo -e "Please generate one with the following script and start the openwsman service again:\n"
Praveen K Paladugu f23808c
+	echo "##################################"
Praveen K Paladugu f23808c
+        echo "/etc/openwsman/owsmangencert.sh"
Praveen K Paladugu f23808c
+	echo "================================="
Praveen K Paladugu f23808c
+
Praveen K Paladugu f23808c
+	echo "NOTE: The script uses /dev/random device for generating some random bits while generating the server key."
Praveen K Paladugu f23808c
+	echo -e "      If this takes too long, you can replace the value of \"RANDFILE\" in @SYSCONFDIR@/ssleay.cnf with /dev/urandom.\n      Please understand the implications of doing do."
Praveen K Paladugu f23808c
+		
Praveen K Paladugu f23808c
       fi
Praveen K Paladugu f23808c
     fi
Praveen K Paladugu f23808c
 
Praveen K Paladugu f23808c
@@ -145,6 +141,10 @@ case "$1" in
c8234dd
     fi
c8234dd
     ;;
c8234dd
 
c8234dd
+   condrestart)
c8234dd
+      [ -e $lockfile ] && restart
Praveen K Paladugu f23808c
+    ;;
c8234dd
+
c8234dd
     *)
Praveen K Paladugu f23808c
     echo "Usage: $0 {restart|start|stop|reload|force-reload|status}"
c8234dd
 esac
Praveen K Paladugu f23808c
diff -up ./etc/owsmangencert.sh.in.old ./etc/owsmangencert.sh.in
Praveen K Paladugu f23808c
--- ./etc/owsmangencert.sh.in.old	2010-08-04 17:14:31.241100874 -0500
Praveen K Paladugu f23808c
+++ ./etc/owsmangencert.sh.in	2010-08-04 17:21:02.944850958 -0500
Praveen K Paladugu f23808c
@@ -1,7 +1,5 @@
Praveen K Paladugu f23808c
 #!/bin/sh
Praveen K Paladugu f23808c
 
Praveen K Paladugu f23808c
-#!/bin/sh -e
Praveen K Paladugu f23808c
-
Praveen K Paladugu f23808c
 CERTFILE=@SYSCONFDIR@/servercert.pem
Praveen K Paladugu f23808c
 KEYFILE=@SYSCONFDIR@/serverkey.pem
Praveen K Paladugu f23808c
 CNFFILE=@SYSCONFDIR@/ssleay.cnf
Praveen K Paladugu f23808c
@@ -15,19 +13,33 @@ if [ "$1" = "--force" ]; then
Praveen K Paladugu f23808c
   shift
Praveen K Paladugu f23808c
 fi
Praveen K Paladugu f23808c
 
Praveen K Paladugu f23808c
+FQDN=`hostname --fqdn`
Praveen K Paladugu f23808c
+        if [ "x${FQDN}" = "x" ]; then
Praveen K Paladugu f23808c
+          FQDN=localhost.localdomain
Praveen K Paladugu f23808c
+        fi
Praveen K Paladugu f23808c
 echo
Praveen K Paladugu f23808c
 echo creating selfsingned certificate
Praveen K Paladugu f23808c
 echo "replace it with one signed by a certification authority (CA)"
Praveen K Paladugu f23808c
 echo
Praveen K Paladugu f23808c
-echo enter your ServerName at the Common Name prompt
Praveen K Paladugu f23808c
+#echo enter your ServerName at the Common Name prompt
Praveen K Paladugu f23808c
 echo
Praveen K Paladugu f23808c
 
Praveen K Paladugu f23808c
 # use special .cnf, because with normal one no valid selfsigned
Praveen K Paladugu f23808c
 # certificate is created
Praveen K Paladugu f23808c
 
Praveen K Paladugu f23808c
-export RANDFILE=/dev/random
Praveen K Paladugu f23808c
-openssl req -days 365 $@ -config $CNFFILE \
Praveen K Paladugu f23808c
+#export RANDFILE=/dev/random
Praveen K Paladugu f23808c
+cat <
Praveen K Paladugu f23808c
   -new -x509 -nodes -out $CERTFILE \
Praveen K Paladugu f23808c
   -keyout $KEYFILE
Praveen K Paladugu f23808c
+--
Praveen K Paladugu f23808c
+SomeState
Praveen K Paladugu f23808c
+SomeCity
Praveen K Paladugu f23808c
+SomeOrganization
Praveen K Paladugu f23808c
+SomeOrganizationalUnit
Praveen K Paladugu f23808c
+${FQDN}
Praveen K Paladugu f23808c
+root@${FQDN}
Praveen K Paladugu f23808c
+EOF
Praveen K Paladugu f23808c
+
Praveen K Paladugu f23808c
+ 
Praveen K Paladugu f23808c
 chmod 600 $KEYFILE
c8234dd