- add webapps.d

Changed files:
    apache-httpd.conf -> 1.40
    apache.spec -> 1.417

diff --git a/apache-httpd.conf b/apache-httpd.conf
index a465b5f2e9af90746456ae1f9b5faffcbcf15e3c..03f821ff014be4d97cd8f9a057d937e5d05cc5b4 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -882,4 +882,7 @@ AddHandler type-map var
     BrowserMatch "^gnome-vfs" redirect-carefully
 </IfModule>
 
+# include webapps configs
+Include webapps.d/*.conf
+
 # vim: filetype=apache ts=4 sw=4 et

diff --git a/apache.spec b/apache.spec
index 82ebb72bc701b807c313ab7d46ab0af6a039eb16..a34368217a9ed3d300bafaa4e5021d0b993aa9a7 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -34,7 +34,7 @@ Summary(ru):  
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       2.0.55
-Release:       2
+Release:       2.3
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -884,6 +884,7 @@ done
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \
        $RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/apache,lock/mod_dav} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
        $RPM_BUILD_ROOT%{_datadir}/cgi-bin
 
 # prefork is default one
@@ -1038,6 +1039,15 @@ if [ -f /etc/sysconfig/apache.rpmsave ]; then
        mv -f /etc/sysconfig/{apache.rpmsave,httpd}
 fi
 
+%triggerpostun -- %{name} < 2.0.55-2.3
+# make sure webapps.d is included
+cp -f /etc/httpd/httpd.conf/10_httpd.conf{,.rpmsave}
+# this file is ugly, so just append new lines
+cat <<EOF >> /etc/httpd/httpd.conf/10_httpd.conf
+# Include webapps config
+Include webapps.d/*.conf
+EOF
+
 %posttrans
 # minimizing apache restarts logics. we restart webserver:
 #
@@ -1224,7 +1234,9 @@ fi
 
 %attr(754,root,root) /etc/rc.d/init.d/httpd
 
+# TODO: switch to conf.d, instead of confusing *dir* httpd.conf
 %attr(750,root,root) %dir %{_sysconfdir}/httpd.conf
+%attr(750,root,root) %dir %{_sysconfdir}/webapps.d
 %attr(750,root,root) %dir %{_sysconfdir}/modules
 %attr(750,root,root) %dir %{_sysconfdir}/run
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_httpd.conf