diff options
| author | Joe Orton <jorton@apache.org> | 2018-10-05 17:25:04 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2018-10-05 17:25:04 +0200 |
| commit | 0507bb7e88b65ad672f9686953ff09243c3afe84 (patch) | |
| tree | e61c0728db054a2ad199c225c37f4a5bdba0e0fb /config.layout | |
| parent | * modules/cache/mod_cache_disk.c (write_headers): Handle (diff) | |
| download | apache2-0507bb7e88b65ad672f9686953ff09243c3afe84.tar.xz apache2-0507bb7e88b65ad672f9686953ff09243c3afe84.zip | |
Define "state directory" for storing persistent child-writable state,
with default from config.layout, configurable via DefaultStateDir.
* server/core.c (set_state_dir, ap_state_dir_relative):
New functions.
* config.layout, acinclude.m4, Makefile.in, configure.in: Define
statedir variables, drop davlockdb.
* include/ap_config_layout.h.in: Define DEFAULT_REL_STATEDIR,
DEFAULT_EXP_STATEDIR in place of _DAVLOCKDB.
* include/ap_mmn.h: Bump MMN minor.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842929 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'config.layout')
| -rw-r--r-- | config.layout | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config.layout b/config.layout index 8579587297..71c046c050 100644 --- a/config.layout +++ b/config.layout @@ -29,6 +29,7 @@ includedir: ${prefix}/include localstatedir: ${prefix} runtimedir: ${localstatedir}/logs + statedir: ${localstatedir}/state logfiledir: ${localstatedir}/logs proxycachedir: ${localstatedir}/proxy </Layout> @@ -54,6 +55,7 @@ includedir: ${prefix}/include+ localstatedir: ${prefix}/var+ runtimedir: ${localstatedir}/run + statedir: ${localstatedir}/state logfiledir: ${localstatedir}/log proxycachedir: ${localstatedir}/proxy </Layout> @@ -78,6 +80,7 @@ includedir: /System/Library/Frameworks/Apache.framework/Versions/2.0/Headers localstatedir: /var runtimedir: ${prefix}/Logs + statedir: ${prefix}/State logfiledir: ${prefix}/Logs proxycachedir: ${prefix}/ProxyCache </Layout> @@ -102,6 +105,7 @@ includedir: ${prefix}/include+ localstatedir: /var runtimedir: ${localstatedir}/run + statedir: ${localstatedir}/state logfiledir: ${localstatedir}/log+ proxycachedir: ${runtimedir}/proxy </Layout> @@ -126,6 +130,7 @@ includedir: ${prefix}/include/apache localstatedir: /var runtimedir: ${localstatedir}/run + statedir: ${localstatedir}/lib/httpd logfiledir: ${localstatedir}/log/httpd proxycachedir: ${localstatedir}/cache/httpd </Layout> @@ -151,6 +156,7 @@ includedir: ${prefix}/include/httpd runtimedir: /run/httpd logfiledir: ${localstatedir}/log/httpd + statedir: ${localstatedir}/lib/httpd proxycachedir: ${localstatedir}/cache/httpd/proxy </Layout> @@ -175,6 +181,7 @@ localstatedir: /var${prefix} runtimedir: ${localstatedir}/run logfiledir: ${localstatedir}/logs + statedir: ${localstatedir}/state proxycachedir: ${localstatedir}/proxy </Layout> @@ -197,6 +204,7 @@ cgidir: ${datadir}/cgi-bin includedir: ${prefix}/include/apache localstatedir: /var/lib/httpd + statedir: ${localstatedir} runtimedir: /var/run logfiledir: /var/log/httpd proxycachedir: /var/cache/httpd @@ -223,6 +231,7 @@ localstatedir: /var runtimedir: ${localstatedir}/run logfiledir: ${localstatedir}/log/httpd + statedir: ${prefix}/state proxycachedir: ${localstatedir}/proxy </Layout> @@ -246,6 +255,7 @@ includedir: ${exec_prefix}/include localstatedir: ${prefix} runtimedir: /var/run + statedir: ${datadir}/state logfiledir: ${datadir}/logs proxycachedir: ${datadir}/proxy </Layout> @@ -271,6 +281,7 @@ localstatedir: ${prefix} runtimedir: ${prefix}/logs logfiledir: ${prefix}/logs + statedir: ${prefix}/state proxycachedir: ${prefix}/proxy </Layout> @@ -315,6 +326,7 @@ cgidir: ${prefix}/usr/lib/cgi-bin includedir: ${exec_prefix}/include/apache2 localstatedir: ${prefix}/var/lock/apache2 + statedir: ${prefix}/var/lib/apache2 runtimedir: ${prefix}/var/run/apache2 logfiledir: ${prefix}/var/log/apache2 proxycachedir: ${prefix}/var/cache/apache2/proxy @@ -343,6 +355,7 @@ manualdir: ${datadir}/manual cgidir: ${datadir}/cgi-bin runtimedir: ${localstatedir}/run + runtimedir: ${localstatedir}/lib/httpd logfiledir: ${localstatedir}/log/httpd proxycachedir: ${localstatedir}/cache/httpd/cache-root </Layout> @@ -366,6 +379,7 @@ manualdir: ${prefix}/manual includedir: ${prefix}/include localstatedir: /var/httpd + statedir: ${localstatedir}/state runtimedir: ${localstatedir}/run logfiledir: ${localstatedir}/logs proxycachedir: ${localstatedir}/proxy @@ -391,6 +405,7 @@ includedir: ${prefix}/include/httpd localstatedir: /var runtimedir: ${localstatedir}/run/httpd + statedir: ${localstatedir}/lib/httpd logfiledir: ${localstatedir}/log/httpd proxycachedir: ${localstatedir}/cache/httpd </Layout> |