- resolve conflicting cache dir

Changed files:
    apache-layout.patch -> 1.5
    apache-mod_cache.conf -> 1.3

diff --git a/apache-layout.patch b/apache-layout.patch
index 6c9bb92756f0d58b46b54cac2b68caabd429410d..f3bfdb85b8cea788a60ed5d9034ed266758a48da 100644 (file)
--- a/apache-layout.patch
+++ b/apache-layout.patch
@@ -27,6 +27,6 @@ diff -urN httpd-2.0.45.org/config.layout httpd-2.0.45/config.layout
 +    localstatedir: /var/lib/httpd
 +    runtimedir:    /var/run
 +    logfiledir:    /var/log/httpd
-+    proxycachedir: /var/cache/apache
++    proxycachedir: /var/cache/httpd
 +    installbuilddir: ${exec_prefix}/lib/apache/build
 +</Layout>

diff --git a/apache-mod_cache.conf b/apache-mod_cache.conf
index 14ebe11bb9208aea1baab620fb48b720b4cf77ed..e2662c0e833abd54d70e6e05d0d39b74153ab63d 100644 (file)
--- a/apache-mod_cache.conf
+++ b/apache-mod_cache.conf
@@ -9,7 +9,7 @@ LoadModule cache_module modules/mod_cache.so
        # If you want to use mod_disk_cache instead of mod_mem_cache,
        # uncomment the line above and comment out the LoadModule line below.
        <IfModule mod_disk_cache.c>
-               CacheRoot "/var/cache/apache"
+               CacheRoot "/var/cache/httpd"
                CacheEnable disk /
                CacheDirLevels 5
                CacheDirLength 3