components/apache24/patches/dav.conf.in.patch
author April Chin <april.chin@oracle.com>
Fri, 31 Jul 2015 13:11:47 -0700
changeset 4727 3ef0841967f5
parent 2079 46ce7840065c
permissions -rw-r--r--
21466647 Ruby tests should be patched to fix test failures when using upgraded OpenSSL

Patch origin: in-house
Patch status: Solaris-specific; not suitable for upstream

Enforces usage of /var instead of /usr for data.
Enforces lock file into /var/run.

--- docs/conf/extra/httpd-dav.conf.in
+++ docs/conf/extra/httpd-dav.conf.in
@@ -12,18 +12,18 @@
 # on the directory where the DavLockDB is placed and on any directory where
 # "Dav On" is specified.
 
-DavLockDB "@@ServerRoot@@/var/DavLock"
+DavLockDB "@@RuntimeDir@@/DavLock"
 
-Alias /uploads "@@ServerRoot@@/uploads"
+Alias /uploads "@@DataDir@@/uploads"
 
-<Directory "@@ServerRoot@@/uploads">
+<Directory "@@DataDir@@/uploads">
     Dav On
 
     AuthType Digest
     AuthName DAV-upload
     # You can use the htdigest program to create the password database:
-    #   htdigest -c "@@ServerRoot@@/user.passwd" DAV-upload admin
-    AuthUserFile "@@ServerRoot@@/user.passwd"
+    #   htdigest -c "@@SysconfDir@@/user.passwd" DAV-upload admin
+    AuthUserFile "@@SysconfDir@@/user.passwd"
     AuthDigestProvider file
 
     # Allow universal read-access, but writes are restricted