SPECS: template-webapp.spec - order

[glen]

Author: glen                         Date: Tue Mar  7 12:44:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- order

---- Files affected:
SPECS:
   template-webapp.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/template-webapp.spec
diff -u SPECS/template-webapp.spec:1.39 SPECS/template-webapp.spec:1.40
--- SPECS/template-webapp.spec:1.39	Thu Feb  2 15:39:28 2006
+++ SPECS/template-webapp.spec	Tue Mar  7 13:44:19 2006
@@ -84,8 +84,6 @@
 		mv -f /etc/%{name}/$i.rpmsave %{_sysconfdir}/$i
 	fi
 done
-# update htpasswd path
-#sed -i -e 's,/etc/%{name},%{_webapps}/%{_webapp},' %{_webapps}/%{_webapp}/{apache,httpd}.conf
 
 # nuke very-old config location (this mostly for Ra)
 if [ -f /etc/httpd/httpd.conf ]; then
@@ -128,6 +126,9 @@
 	rm -f /etc/apache-%{name}.conf.rpmsave
 fi
 
+# update htpasswd path
+#sed -i -e 's,/etc/%{name},%{_webapps}/%{_webapp},' %{_webapps}/%{_webapp}/{apache,httpd}.conf
+
 # migrating from earlier apache-config?
 if [ -L /etc/apache/conf.d/99_%{name}.conf ] || [ -L /etc/httpd/httpd.conf/99_%{name}.conf ]; then
 	if [ -L /etc/apache/conf.d/99_%{name}.conf ]; then
@@ -175,6 +176,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/03/07 12:44:19  glen
+- order
+
 Revision 1.39  2006/02/02 14:39:28  glen
 - update apache2 trigger to match apache-base in case somebody decides not to use apache virtual pkg
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-webapp.spec?r1=1.39&r2=1.40&f=u