- migrate apache 2.0 config

  tested on last apache 2.0 package from main
  needs probably more testing and samples

Changed files:
    apache.spec -> 1.465

diff --git a/apache.spec b/apache.spec
index a1e0cf4b9ac3792de92c8877c17ea1f9ab18c097..a171940a5eb6a4e90bd890ae26a69e4803fc69ff 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -35,7 +35,7 @@ Summary(ru):  
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
 Version:       2.2.0
-Release:       9
+Release:       9.3
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -2079,6 +2079,41 @@ fi
 cp -f /etc/sysconfig/httpd{,.rpmorig}
 sed -i -e '/^HTTPD_CONF="\/etc\/httpd\/httpd.conf"/s,.*,HTTPD_CONF="/etc/httpd/apache.conf",' /etc/sysconfig/httpd
 
+if [ -f /etc/httpd/conf.d/10_httpd.conf.rpmsave ]; then
+       sed -e '
+       # as separate modules
+       /^LoadModule access_module/s,^,#,
+       /^LoadModule alias_module/s,^,#,
+       /^LoadModule asis_module/s,^,#,
+       /^LoadModule cern_meta_module/s,^,#,
+       /^LoadModule cgi_module/s,^,#,
+       /^LoadModule env_module/s,^,#,
+       /^LoadModule include_module/s,^,#,
+       /^LoadModule log_config_module/s,^,#,
+       /^LoadModule mime_magic_module/s,^,#,
+       /^LoadModule mime_module/s,^,#,
+       /^LoadModule negotiation_module/s,^,#,
+       /^LoadModule setenvif_module/s,^,#,
+       /^LoadModule speling_module/s,^,#,
+       /^LoadModule userdir_module/s,^,#,
+
+       # in 30_errordocs.conf
+       /<IfModule mod_include.c>/,/<\/IfModule>/s,^,#,
+
+       # in 57_mod_autoindex.conf
+       /^Alias \/icons\//s,^,#,
+
+       # in apache.conf
+       /^ScriptAlias \/cgi-bin\//s,^,#,
+       /^Listen 80/s,^,#,
+
+       # avoid loops
+       /Include conf.d\/\*.conf/s,^,#,
+       /Include webapps.d\/\*.conf/s,^,#,
+
+       ' < /etc/httpd/conf.d/10_httpd.conf.rpmsave > /etc/httpd/conf.d/10_httpd.conf
+fi
+
 # FIXME what other important things to notify about Apache 2.2
 %banner -e %{name} <<'EOF'
 NB! Apache main config has been changed to /etc/httpd/apache.conf