No objections, so put it in:

Use the correct locations of srm.conf and access.conf when tailoring
the httpd.conf during the install process.

PR: 9446
Submitted by: Stanislav Brabec <utx@penguin.cz>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@98841 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.tmpl b/Makefile.tmpl
index d4a73ef32fd9b83e774351836fed430ba5dad4b6..146ebddcba1f1d6373e5de633a89f4f74a9c712e 100644 (file)
--- a/Makefile.tmpl
+++ b/Makefile.tmpl
@@ -529,6 +529,8 @@ install-config:
                        -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
                        -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
                        -e 's;conf/magic;$(sysconfdir)/magic;' \
+                       -e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \
+                       -e 's;conf/access.conf;$(sysconfdir)/access.conf;' \
                        -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
                        -e 's;User nobody;User $(conf_user);' \
                        -e 's;Group #-1;Group $(conf_group);' \

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index f136bc8a2ddc125710d115439f75aa81194981bf..df13e82913063bccd3d68849572b10adae4945d7 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -11,7 +11,7 @@
 # consult the online docs. You have been warned.  
 #
 # After this file is processed, the server will look for and process
-# @@ServerRoot@@/conf/srm.conf and then @@ServerRoot@@/conf/access.conf
+# conf/srm.conf and then conf/access.conf
 # unless you have overridden these with ResourceConfig and/or
 # AccessConfig directives here.
 #

diff --git a/src/CHANGES b/src/CHANGES
index 7cf2d1730910cbfec978d284d1627c4c094e2230..1b026646060aee77a8f7722d0e21f29e4b37975b 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.28
 
+  *) Use the correct locations of srm.conf and access.conf when tailoring
+     the httpd.conf during the install process. PR 9446.
+     [Stanislav Brabec <utx@penguin.cz>]
+
   *) suexec: Be more pedantic when cleaning environment. Clean it
      immediately after startup. PR 2790, 10449.
      [Jeff Stewart <jws@purdue.edu>, André Malo]