[csw-devel] SF.net SVN: gar:[11635] csw/mgar/pkg/apache2/trunk/files/server.crt. build_cas

[bdwalton at users.sourceforge.net]

Revision: 11635
          http://gar.svn.sourceforge.net/gar/?rev=11635&view=rev
Author:   bdwalton
Date:     2010-11-16 02:30:15 +0000 (Tue, 16 Nov 2010)

Log Message:
-----------
apache2: ensure the ssl cert build script always outputs data for the dummy file; notify admin that cert files are not touched during install if they exist

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas

Modified: csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas	2010-11-16 01:41:06 UTC (rev 11634)
+++ csw/mgar/pkg/apache2/trunk/files/server.crt.build_cas	2010-11-16 02:30:15 UTC (rev 11635)
@@ -7,11 +7,12 @@
 AP2_CONFDIR=$AP2_PREFIX/etc
 
 if [ "$1" = install ]; then
+    # this gets captured and placed by the build CAS
+    echo This is a dummy file but still a part of CSWapache2
+    echo Please do not remove.
+
     if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then
 	echo Generating dummy ssl key and certificate... >&2
-	# this gets captured and placed by the build CAS
-	echo This is a dummy file but still a part of CSWapache2
-	echo Please do not remove.
 
         # this is likely overkill for a dummy cert, but why not
 	cat <<EOF | /usr/sbin/chroot ${PIR} /opt/csw/bin/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout $AP2_CONFDIR/server.key  -out $AP2_CONFDIR/server.crt >/dev/null 2>&1
@@ -27,6 +28,8 @@
 EOF
 	chmod 600 $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt
 	chown root:bin $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt
+    else
+	echo "Not touching existing SSL files." >&2
     fi
 fi
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.