66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
Description: Fix up FHS file locations for apache2 droppings.
|
|
Forwarded: not-needed
|
|
Author: Adam Conrad <adconrad@0c3.net>
|
|
Reviewed-By: Yadd <yadd@debian.org>
|
|
Last-Update: 2023-10-19
|
|
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -42228,13 +42228,13 @@
|
|
ap_prefix="${ap_cur}"
|
|
|
|
|
|
-printf "%s\n" "#define HTTPD_ROOT \"${ap_prefix}\"" >>confdefs.h
|
|
+printf "%s\n" "#define HTTPD_ROOT \"/etc/apache2\"" >>confdefs.h
|
|
|
|
|
|
-printf "%s\n" "#define SERVER_CONFIG_FILE \"${rel_sysconfdir}/${progname}.conf\"" >>confdefs.h
|
|
+printf "%s\n" "#define SERVER_CONFIG_FILE \"${progname}.conf\"" >>confdefs.h
|
|
|
|
|
|
-printf "%s\n" "#define AP_TYPES_CONFIG_FILE \"${rel_sysconfdir}/mime.types\"" >>confdefs.h
|
|
+printf "%s\n" "#define AP_TYPES_CONFIG_FILE \"mime.types\"" >>confdefs.h
|
|
|
|
|
|
perlbin=`$ac_aux_dir/PrintPath perl`
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -934,11 +934,11 @@
|
|
echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
|
|
|
|
APR_EXPAND_VAR(ap_prefix, $prefix)
|
|
-AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_prefix}",
|
|
+AC_DEFINE_UNQUOTED(HTTPD_ROOT, "/etc/apache2",
|
|
[Root directory of the Apache install area])
|
|
-AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
|
|
+AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${progname}.conf",
|
|
[Location of the config file, relative to the Apache root directory])
|
|
-AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
|
|
+AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "mime.types",
|
|
[Location of the MIME types config file, relative to the Apache root directory])
|
|
|
|
perlbin=`$ac_aux_dir/PrintPath perl`
|
|
--- a/include/ap_config_layout.h.in
|
|
+++ b/include/ap_config_layout.h.in
|
|
@@ -60,5 +60,6 @@
|
|
#define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
|
|
#define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
|
|
#define DEFAULT_REL_PROXYCACHEDIR "@rel_proxycachedir@"
|
|
+#define DEFAULT_PIDLOG "/var/run/apache2.pid"
|
|
|
|
#endif /* AP_CONFIG_LAYOUT_H */
|
|
--- a/include/httpd.h
|
|
+++ b/include/httpd.h
|
|
@@ -107,10 +107,10 @@
|
|
#ifndef DOCUMENT_LOCATION
|
|
#ifdef OS2
|
|
/* Set default for OS/2 file system */
|
|
-#define DOCUMENT_LOCATION HTTPD_ROOT "/docs"
|
|
+#define DOCUMENT_LOCATION "/var/www/html"
|
|
#else
|
|
/* Set default for non OS/2 file system */
|
|
-#define DOCUMENT_LOCATION HTTPD_ROOT "/htdocs"
|
|
+#define DOCUMENT_LOCATION "/var/www/html"
|
|
#endif
|
|
#endif /* DOCUMENT_LOCATION */
|
|
|