[Webapps-common-discuss] [commit] r136 - in webapps-common/trunk: debian templates

[sgran at alioth.debian.org]

Author: sgran
Date: 2007-09-07 15:39:25 +0000 (Fri, 07 Sep 2007)
New Revision: 136

Modified:
   webapps-common/trunk/debian/changelog
   webapps-common/trunk/debian/webapps-common.postinst
   webapps-common/trunk/templates/apache-global.conf
Log:
more sed fixups

Modified: webapps-common/trunk/debian/changelog
===================================================================
--- webapps-common/trunk/debian/changelog	2007-09-07 15:36:57 UTC (rev 135)
+++ webapps-common/trunk/debian/changelog	2007-09-07 15:39:25 UTC (rev 136)
@@ -18,9 +18,9 @@
 
   [ Stephen Gran ]
   * ucf purge config files on purge
-  * fix sed statement in postinst
+  * fix sed statements in postinst
 
- -- Stephen Gran <sgran at debian.org>  Fri,  7 Sep 2007 11:36:29 -0400
+ -- Stephen Gran <sgran at debian.org>  Fri,  7 Sep 2007 11:39:03 -0400
 
 webapps-common (0.7) UNRELEASED; urgency=low
 

Modified: webapps-common/trunk/debian/webapps-common.postinst
===================================================================
--- webapps-common/trunk/debian/webapps-common.postinst	2007-09-07 15:36:57 UTC (rev 135)
+++ webapps-common/trunk/debian/webapps-common.postinst	2007-09-07 15:39:25 UTC (rev 136)
@@ -18,7 +18,7 @@
 		ucf $tfile /etc/$httpd/conf.d/webapps-common.conf
 		# XXX should probably respect permissions here
 		chown root:www-data /etc/$httpd/conf.d/webapps-common.conf
-		sed -e "s,HTTPD,$httpd,g" < ${template_dir}/apache-virtualhost.conf > $tfile
+		sed -e "s,_WC_HTTPD_,$httpd,g" < ${template_dir}/apache-virtualhost.conf > $tfile
 		ucf $tfile /etc/webapps-common/custom-templates/$httpd/virtualhost.conf
 		# XXX should probably respect permissions here
 		chown root:www-data /etc/$httpd/conf.d/webapps-common.conf

Modified: webapps-common/trunk/templates/apache-global.conf
===================================================================
--- webapps-common/trunk/templates/apache-global.conf	2007-09-07 15:36:57 UTC (rev 135)
+++ webapps-common/trunk/templates/apache-global.conf	2007-09-07 15:39:25 UTC (rev 136)
@@ -5,4 +5,4 @@
 #
 # for virtualhost-specific app settings you should look in
 # /etc/webapps-common/apps-available/HTTPD/yourvhostname/*.conf
-Include /etc/webapps-common/apps-enabled/HTTPD/__global__/*.conf
+Include /etc/webapps-common/apps-enabled/_WC_HTTPD_/__global__/*.conf