You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "Ralf S. Engelschall" <rs...@engelschall.com> on 1998/12/01 13:33:09 UTC
[PATCH] Configuration (2/4): Single Config
Configuration (2/4): Single Config [config-single]
--------------------------------------------------
This patch is extracted from Randys work and changes the
installation procedure: The access.conf and srm.conf (dummy)
files are no longer installed.
Ralf S. Engelschall
rse@engelschall.com
www.engelschall.com
Index: Makefile.tmpl
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/Makefile.tmpl,v
retrieving revision 1.50
diff -u -r1.50 Makefile.tmpl
--- Makefile.tmpl 1998/11/13 11:25:01 1.50
+++ Makefile.tmpl 1998/12/01 12:25:29
@@ -199,9 +199,9 @@
echo "| You now have successfully built and installed the |"; \
echo "| Apache 1.3 HTTP server. To verify that Apache actually |"; \
echo "| works correctly you now should first check the |"; \
- echo "| (initially created or preserved) configuration files |"; \
+ echo "| (initially created or preserved) configuration file |"; \
echo "| |"; \
- echo "| $(sysconfdir)/{httpd,access,srm}.conf"; \
+ echo "| $(sysconfdir)/httpd.conf"; \
echo "| |"; \
echo "| and then you should be able to immediately fire up |"; \
echo "| Apache the first time by running: |"; \
@@ -373,41 +373,39 @@
# and initial config files while preserving existing ones.
install-config:
@echo "===> [config: Installing Apache configuration files]"
- -@for conf in httpd.conf access.conf srm.conf; do \
- (echo "##"; \
- echo "## $${conf} -- Apache HTTP server configuration file"; \
- echo "##"; \
- echo ""; \
- cat $(TOP)/conf/$${conf}-dist ) |\
- sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
- -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
- -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
- -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
- -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
- -e 's;@@ServerRoot@@;$(prefix);' \
- -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
- -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
- -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
- -e 's;logs/access_log;$(logfiledir)/access_log;' \
- -e 's;logs/error_log;$(logfiledir)/error_log;' \
- -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
- -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
- -e 's;conf/magic;$(sysconfdir)/magic;' \
- -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
- -e 's;Group #-1;Group $(conf_group);' \
- -e 's;Port 80;Port $(conf_port);' \
- -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
- -e 's;ServerName new.host.name;ServerName $(conf_servername);' \
- > $(TOP)/$(SRC)/.apaci.install.tmp && \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${conf}.default; \
- if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${conf}; \
- else \
- echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
- fi; \
- done
+ (echo "##"; \
+ echo "## httpd.conf -- Apache HTTP server configuration file"; \
+ echo "##"; \
+ echo ""; \
+ cat $(TOP)/conf/httpd.conf-dist ) |\
+ sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
+ -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
+ -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
+ -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+ -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
+ -e 's;@@ServerRoot@@;$(prefix);' \
+ -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
+ -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
+ -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
+ -e 's;logs/access_log;$(logfiledir)/access_log;' \
+ -e 's;logs/error_log;$(logfiledir)/error_log;' \
+ -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
+ -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
+ -e 's;conf/magic;$(sysconfdir)/magic;' \
+ -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
+ -e 's;Group #-1;Group $(conf_group);' \
+ -e 's;Port 80;Port $(conf_port);' \
+ -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
+ -e 's;ServerName new.host.name;ServerName $(conf_servername);' \
+ > $(TOP)/$(SRC)/.apaci.install.tmp && \
+ echo "$(INSTALL_DATA) $(TOP)/conf/httpd.conf-dist[*] $(root)$(sysconfdir)/httpd.conf.default"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/httpd.conf.default; \
+ if [ ! -f "$(root)$(sysconfdir)/httpd.conf" ]; then \
+ echo "$(INSTALL_DATA) $(TOP)/conf/httpd.conf-dist[*] $(root)$(sysconfdir)/httpd.conf"; \
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/httpd.conf; \
+ else \
+ echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/httpd.conf]"; \
+ fi; \
-@for conf in mime.types magic; do \
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
Re: [PATCH] Configuration (2/4): Single Config
Posted by Randy Terbush <ra...@Covalent.NET>.
+1 Please commit.
"Ralf S. Engelschall" <rs...@engelschall.com> writes:
> Configuration (2/4): Single Config [config-single]
> --------------------------------------------------
>
> This patch is extracted from Randys work and changes the
> installation procedure: The access.conf and srm.conf (dummy)
> files are no longer installed.
> Ralf S. Engelschall
> rse@engelschall.com
> www.engelschall.com
>
> Index: Makefile.tmpl
> ===================================================================
> RCS file: /e/apache/REPOS/apache-1.3/Makefile.tmpl,v
> retrieving revision 1.50
> diff -u -r1.50 Makefile.tmpl
> --- Makefile.tmpl 1998/11/13 11:25:01 1.50
> +++ Makefile.tmpl 1998/12/01 12:25:29
> @@ -199,9 +199,9 @@
> echo "| You now have successfully built and installed the |"; \
> echo "| Apache 1.3 HTTP server. To verify that Apache actually |"; \
> echo "| works correctly you now should first check the |"; \
> - echo "| (initially created or preserved) configuration files |"; \
> + echo "| (initially created or preserved) configuration file |"; \
> echo "| |"; \
> - echo "| $(sysconfdir)/{httpd,access,srm}.conf"; \
> + echo "| $(sysconfdir)/httpd.conf"; \
> echo "| |"; \
> echo "| and then you should be able to immediately fire up |"; \
> echo "| Apache the first time by running: |"; \
> @@ -373,41 +373,39 @@
> # and initial config files while preserving existing ones.
> install-config:
> @echo "===> [config: Installing Apache configuration files]"
> - -@for conf in httpd.conf access.conf srm.conf; do \
> - (echo "##"; \
> - echo "## $${conf} -- Apache HTTP server configuration file"; \
> - echo "##"; \
> - echo ""; \
> - cat $(TOP)/conf/$${conf}-dist ) |\
> - sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
> - -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
> - -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
> - -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
> - -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
> - -e 's;@@ServerRoot@@;$(prefix);' \
> - -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
> - -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
> - -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
> - -e 's;logs/access_log;$(logfiledir)/access_log;' \
> - -e 's;logs/error_log;$(logfiledir)/error_log;' \
> - -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
> - -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
> - -e 's;conf/magic;$(sysconfdir)/magic;' \
> - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
> - -e 's;Group #-1;Group $(conf_group);' \
> - -e 's;Port 80;Port $(conf_port);' \
> - -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
> - -e 's;ServerName new.host.name;ServerName $(conf_servername);' \
> - > $(TOP)/$(SRC)/.apaci.install.tmp && \
> - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default"; \
> - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${conf}.default; \
> - if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
> - echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}"; \
> - $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${conf}; \
> - else \
> - echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
> - fi; \
> - done
> + (echo "##"; \
> + echo "## httpd.conf -- Apache HTTP server configuration file"; \
> + echo "##"; \
> + echo ""; \
> + cat $(TOP)/conf/httpd.conf-dist ) |\
> + sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
> + -e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
> + -e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
> + -e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
> + -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
> + -e 's;@@ServerRoot@@;$(prefix);' \
> + -e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
> + -e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
> + -e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
> + -e 's;logs/access_log;$(logfiledir)/access_log;' \
> + -e 's;logs/error_log;$(logfiledir)/error_log;' \
> + -e 's;logs/referer_log;$(logfiledir)/referer_log;' \
> + -e 's;logs/agent_log;$(logfiledir)/agent_log;' \
> + -e 's;conf/magic;$(sysconfdir)/magic;' \
> + -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
> + -e 's;Group #-1;Group $(conf_group);' \
> + -e 's;Port 80;Port $(conf_port);' \
> + -e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
> + -e 's;ServerName new.host.name;ServerName $(conf_servername);' \
> + > $(TOP)/$(SRC)/.apaci.install.tmp && \
> + echo "$(INSTALL_DATA) $(TOP)/conf/httpd.conf-dist[*] $(root)$(sysconfdir)/httpd.conf.default"; \
> + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/httpd.conf.default; \
> + if [ ! -f "$(root)$(sysconfdir)/httpd.conf" ]; then \
> + echo "$(INSTALL_DATA) $(TOP)/conf/httpd.conf-dist[*] $(root)$(sysconfdir)/httpd.conf"; \
> + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/httpd.conf; \
> + else \
> + echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/httpd.conf]"; \
> + fi; \
> -@for conf in mime.types magic; do \
> echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
> $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
Re: [PATCH] Configuration (2/4): Single Config
Posted by Randy Terbush <ra...@Covalent.NET>.
Paul Sutton <pa...@c2.net> writes:
> On Tue, 1 Dec 1998, Marc Slemko wrote:
> > On Tue, 1 Dec 1998, Ralf S. Engelschall wrote:
> > >
> > > Configuration (2/4): Single Config [config-single]
> > > --------------------------------------------------
> > >
> > > This patch is extracted from Randys work and changes the
> > > installation procedure: The access.conf and srm.conf (dummy)
> > > files are no longer installed.
> >
> > I think they should be installed. People are confused enough about
> > the config files; having ones there that they can look at and
> > see "oh, ok, this file isn't needed but I can still put things in
> > it if I want to set it up that way" is very useful. Having them
> > was intended to be a migratory thing, and we haven't even done one
> > release with the change to put everything in httpd.conf yet.
>
> Absolutely. +1.
>
> Removing them with no easily user-visible explaination would not be good.
> We should then remove them from the next release.
>
> Paul
Just to make this clear, we're not talking about removing these from
the source distribution. We're just suggesting not to install them
(via a 'make install' from toplevel) and further clutter unnecessarily
the /conf (or /etc) directory with these files.
I've seen strong support for not installing these files. A
clarification on your strong support would help here Paul.
-Randy
Re: [PATCH] Configuration (2/4): Single Config
Posted by Paul Sutton <pa...@c2.net>.
On Tue, 1 Dec 1998, Marc Slemko wrote:
> On Tue, 1 Dec 1998, Ralf S. Engelschall wrote:
> >
> > Configuration (2/4): Single Config [config-single]
> > --------------------------------------------------
> >
> > This patch is extracted from Randys work and changes the
> > installation procedure: The access.conf and srm.conf (dummy)
> > files are no longer installed.
>
> I think they should be installed. People are confused enough about
> the config files; having ones there that they can look at and
> see "oh, ok, this file isn't needed but I can still put things in
> it if I want to set it up that way" is very useful. Having them
> was intended to be a migratory thing, and we haven't even done one
> release with the change to put everything in httpd.conf yet.
Absolutely. +1.
Removing them with no easily user-visible explaination would not be good.
We should then remove them from the next release.
Paul
--
Paul Sutton, C2Net Europe http://www.eu.c2.net/~paul/
Editor, Apache Week .. the latest Apache news http://www.apacheweek.com/
Re: [PATCH] Configuration (2/4): Single Config
Posted by Marc Slemko <ma...@worldgate.com>.
On Tue, 1 Dec 1998, Ralf S. Engelschall wrote:
>
> Configuration (2/4): Single Config [config-single]
> --------------------------------------------------
>
> This patch is extracted from Randys work and changes the
> installation procedure: The access.conf and srm.conf (dummy)
> files are no longer installed.
I think they should be installed. People are confused enough about
the config files; having ones there that they can look at and
see "oh, ok, this file isn't needed but I can still put things in
it if I want to set it up that way" is very useful. Having them
was intended to be a migratory thing, and we haven't even done one
release with the change to put everything in httpd.conf yet.