Improving certificat contents

diff --git a/support/dummy-cert.sh b/support/dummy-cert.sh
index 3e6a80fbae5c9eb74dbc26044eb98f5220b2b8e1..b489810aa691ccad87d1b829c0eb80197677d391 100755 (executable)
--- a/support/dummy-cert.sh
+++ b/support/dummy-cert.sh
@@ -5,10 +5,10 @@
 umask 077
 
 answers() {
-       echo --
-       echo "SomeState"
-       echo "SomeCity"
-       echo ""
+       echo UN
+       echo "One State in the world"
+       echo "One City Somewhere"
+       echo "An Organization"
        echo "$APPNAME E-mail filtering"
        echo `hostname`
        echo "$APPNAME@"`hostname`
@@ -30,8 +30,9 @@ for target in $@
                -keyout $PEM1                           \
                -nodes                                  \
                -x509                                   \
+               -text                                   \
                -days 3650                              \
-               -out $PEM2 2    > /dev/null
+               -out $PEM2      2>      /dev/null
   cp $PEM1  ${target}-key.pem
   cp $PEM2  ${target}-cert.pem
   rm -f $PEM1 $PEM2

diff --git a/support/starting.sh b/support/starting.sh
index dd5bd887e0861ffa43677823adc8377e6c74cfd9..bff161bcce63f580d894ea7e6d0b8f50f95bda37 100755 (executable)
--- a/support/starting.sh
+++ b/support/starting.sh
@@ -79,9 +79,9 @@ mkdir -p /etc/pki/$APPNAME
 if [ ! -f /etc/pki/$APPNAME/$APPNAME-cert.pem ] ; then
   echo -n $"Preparing $APPNAME certificate: "
   /usr/lib/$APPNAME/support/dummy-cert /etc/pki/$APPNAME/$APPNAME
-  chown $APPNAME:mail                          \
-  /etc/pki/$APPNAME/$APPNAME-cert.pem          \
-  /etc/pki/$APPNAME/$APPNAME-key.pem
+  chown $APPNAME:mail                                  \
+       /etc/pki/$APPNAME/$APPNAME-cert.pem             \
+       /etc/pki/$APPNAME/$APPNAME-key.pem
   sh_success $"certs generation"
   fi
 }