Return-Path: Delivered-To: new-httpd-archive@hyperreal.org Received: (qmail 1709 invoked by uid 6000); 1 Dec 1998 17:05:55 -0000 Received: (qmail 1700 invoked from network); 1 Dec 1998 17:05:54 -0000 Received: from ns1.covalent.net (HELO zuul.covalent.net) (208.214.56.2) by taz.hyperreal.org with SMTP; 1 Dec 1998 17:05:54 -0000 Received: from montana.covalent.net (montana.covalent.net [207.91.27.101]) by zuul.covalent.net (8.9.1/8.9.1) with ESMTP id LAA19157 for ; Tue, 1 Dec 1998 11:05:52 -0600 (CST) (envelope-from randy@Covalent.NET) Received: (from randy@localhost) by montana.covalent.net (8.9.1/8.8.7) id LAA04034; Tue, 1 Dec 1998 11:07:43 -0600 (CST) (envelope-from randy) To: new-httpd@apache.org Subject: Re: [PATCH] Configuration (2/4): Single Config References: <19981201133309.A12518@engelschall.com> Mime-Version: 1.0 (generated by tm-edit 7.108) Content-Type: text/plain; charset=US-ASCII From: Randy Terbush Date: 01 Dec 1998 11:07:43 -0600 In-Reply-To: "Ralf S. Engelschall"'s message of "Tue, 1 Dec 1998 13:33:09 +0100" Message-ID: Lines: 109 X-Mailer: Gnus v5.5/XEmacs 20.4 - "Diamond" Sender: new-httpd-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org +1 Please commit. "Ralf S. Engelschall" 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; \