| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Wed, 25 Feb 2015 02:02:14 -0800 | |
| branch | s11-update |
| changeset 3877 | d7cb5bc8ee50 |
| parent 278 | components/apache2/patches/dav.conf.in.patch@77b380ba9d84 |
| permissions | -rw-r--r-- |
|
3877
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
1 |
Patch origin: in-house |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
3 |
|
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
4 |
Enforces usage of /var instead of /usr for data. |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
5 |
Enforces lock file into /var/run. |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
6 |
|
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
7 |
--- docs/conf/extra/httpd-dav.conf.in |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
8 |
+++ docs/conf/extra/httpd-dav.conf.in |
|
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
9 |
@@ -12,18 +12,18 @@ |
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
# on the directory where the DavLockDB is placed and on any directory where |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
# "Dav On" is specified. |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
-DavLockDB "@@ServerRoot@@/var/DavLock" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+DavLockDB "@@RuntimeDir@@/DavLock" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
-Alias /uploads "@@ServerRoot@@/uploads" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+Alias /uploads "@@DataDir@@/uploads" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
-<Directory "@@ServerRoot@@/uploads"> |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+<Directory "@@DataDir@@/uploads"> |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
Dav On |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
|
|
3877
d7cb5bc8ee50
PSARC/2014/253 Apache 2.4 integration; EOF Apache 2.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
23 |
AuthType Digest |
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
AuthName DAV-upload |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
# You can use the htdigest program to create the password database: |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
- # htdigest -c "@@ServerRoot@@/user.passwd" DAV-upload admin |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
- AuthUserFile "@@ServerRoot@@/user.passwd" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
+ # htdigest -c "@@SysconfDir@@/user.passwd" DAV-upload admin |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
+ AuthUserFile "@@SysconfDir@@/user.passwd" |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
AuthDigestProvider file |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
# Allow universal read-access, but writes are restricted |