[csw-devel] SF.net SVN: gar:[11793] csw/mgar/pkg/apache2/trunk/files/build_cas_template

[bdwalton at users.sourceforge.net]

Revision: 11793
          http://gar.svn.sourceforge.net/gar/?rev=11793&view=rev
Author:   bdwalton
Date:     2010-12-05 17:55:12 +0000 (Sun, 05 Dec 2010)

Log Message:
-----------
apache2: change the way we update paths for ssl key files during migration

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/files/build_cas_template

Modified: csw/mgar/pkg/apache2/trunk/files/build_cas_template
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/build_cas_template	2010-12-05 17:42:17 UTC (rev 11792)
+++ csw/mgar/pkg/apache2/trunk/files/build_cas_template	2010-12-05 17:55:12 UTC (rev 11793)
@@ -24,12 +24,13 @@
          \${PIR}/\$AP2_DIR/sbin/update20to22 \$NEW_CONF_FILE >&2
       fi
 
+      # handle the new path to default ssl key files.
+      perl -pi \
+         -e "s#/opt/csw/apache2/etc/server.crt#/etc/opt/csw/apache2/server.crt#; s#/opt/csw/apache2/etc/server.key#/etc/opt/csw/apache2/server.key#" \$NEW_CONF_FILE
+
       # ensure we use the config files from the new location 
       perl -pi \
          -e "s/etc\//\/etc\/opt\/csw\/apache2\//" \$NEW_CONF_FILE
-
-      perl -pi \
-         -e "s/\/opt\/csw\/apache2\/\/etc\/opt/\/etc\/opt\/csw\/apache2\//" \$NEW_CONF_FILE
    else
       # so, we're not an existing or 'needs migration' install, we must
       # install from the templates.


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