SPECS: apache.spec - migrate apache 2.0 config tested on last ap...

[glen]

Author: glen                         Date: Mon Jan  9 19:33:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- migrate apache 2.0 config
  tested on last apache 2.0 package from main
  needs probably more testing and samples

---- Files affected:
SPECS:
   apache.spec (1.464 -> 1.465) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.464 SPECS/apache.spec:1.465
--- SPECS/apache.spec:1.464	Mon Jan  9 19:55:06 2006
+++ SPECS/apache.spec	Mon Jan  9 20:33:07 2006
@@ -36,7 +36,7 @@
 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
@@ -2080,6 +2080,41 @@
 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
@@ -2670,6 +2705,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.465  2006/01/09 19:33:07  glen
+- migrate apache 2.0 config
+  tested on last apache 2.0 package from main
+  needs probably more testing and samples
+
 Revision 1.464  2006/01/09 18:55:06  glen
 - conflicts apache < 2.2.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.464&r2=1.465&f=u