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

[bdwalton at users.sourceforge.net]

Revision: 11799
          http://gar.svn.sourceforge.net/gar/?rev=11799&view=rev
Author:   bdwalton
Date:     2010-12-06 02:34:23 +0000 (Mon, 06 Dec 2010)

Log Message:
-----------
apache2: collapse several perl calls into one during the config 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-06 02:15:39 UTC (rev 11798)
+++ csw/mgar/pkg/apache2/trunk/files/build_cas_template	2010-12-06 02:34:23 UTC (rev 11799)
@@ -25,19 +25,15 @@
       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
-
       # update various uses of the var/ paths.
+      # ensure we use the config files from the new location 
       perl -pi \
-         -e "s#"/opt/csw/apache2/var/log/#/var/opt/csw/log/apache2/#" \ 
+         -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#" \
+         -e "s#/opt/csw/apache2/var/log/#/var/opt/csw/log/apache2/#" \ 
          -e "s#\"/opt/csw/apache2/var/#\"/var/opt/csw/apache2/#" \
          -e "s#\"var/log/#\"/var/opt/csw/log/apache2/#" \
+         -e "s/etc\//\/etc\/opt\/csw\/apache2\//" \
          \$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
    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.