Php5-Konfuguration im Apache angepasst.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@869 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/httpd/conf.d/php4.conf b/config/httpd/conf.d/php5.conf
similarity index 100%
rename from config/httpd/conf.d/php4.conf
rename to config/httpd/conf.d/php5.conf

diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf
index 7e00b88268105ebb93fa14f707143825a7b78cc7..63c71326295a2718655b365037a4b69884f058b2 100644 (file)
--- a/config/httpd/httpd.conf
+++ b/config/httpd/httpd.conf
@@ -115,6 +115,6 @@ Include /etc/httpd/conf/default-server.conf
 # You may use the command line option '-S' to verify your virtual host
 # configuration.
 #
-Include /etc/httpd/conf/vhosts.d/*.conf
+#Include /etc/httpd/conf/vhosts.d/*.conf
 
 

diff --git a/config/httpd/loadmodule.conf b/config/httpd/loadmodule.conf
index 16e26cf7098ee2b0a9800577cd08747999ecb5d5..b9b931d4d8924093792c8cb4239bfe7347230710 100644 (file)
--- a/config/httpd/loadmodule.conf
+++ b/config/httpd/loadmodule.conf
@@ -48,4 +48,4 @@ LoadModule dir_module /usr/lib/apache/mod_dir.so
 LoadModule alias_module /usr/lib/apache/mod_alias.so
 LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so
 LoadModule ssl_module /usr/lib/apache/mod_ssl.so
-#LoadModule php4_module /usr/lib/apache/libphp4.so
+#LoadModule php5_module /usr/lib/apache/libphp5.so

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 184b34c046e3d3e193e66eed80f125a54519166d..2f8b5a43eda61b45127b8d002f0c538c13486432 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1241,7 +1241,7 @@ usr/sbin/httpd
 #usr/share/man/man8/suexec.8
 var/log/httpd
 etc/httpd/conf/conf.d
-#etc/httpd/conf/conf.d/php4.conf
+#etc/httpd/conf/conf.d/php5.conf
 etc/httpd/conf/default-server.conf
 etc/httpd/conf/global.conf
 etc/httpd/conf/hostname.conf