brian 98/06/15 20:59:11
Modified: . STATUS configure Makefile.tmpl src CHANGES Log: Submitted by: Ralf Reviewed by: Jim, Brian This patch lets APACI's configure script determine more configuration parameters (Group, Port, ServerAdmin, ServerName) via some intelligent tests. Revision Changes Path 1.430 +0 -8 apache-1.3/STATUS Index: STATUS =================================================================== RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.429 retrieving revision 1.430 diff -u -r1.429 -r1.430 --- STATUS 1998/06/16 03:49:52 1.429 +++ STATUS 1998/06/16 03:59:01 1.430 @@ -44,14 +44,6 @@ <[EMAIL PROTECTED]> Status: Ralf +1 - * Ralf's "substitute some more configuration parameters": - This patch lets APACI's configure script determine more configuration - parameters (Group, Port, ServerAdmin, ServerName) via some intelligent - tests to remove some of the classical hurdles for new users when setting - up Apache. - See: http://www.engelschall.com/sw/apache/ [substconfparam] - Status (for 1.3.1-dev): Ralf +1, Jim +1 - * Ralf's "linking DSO modules against possible libraries from $(LIBS)": This patch is a first step for a more powerful and less restrictive DSO mechanism: We allow DSO modules to be linked against other DSO libraries 1.35 +52 -0 apache-1.3/configure Index: configure =================================================================== RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- configure 1998/06/16 03:49:52 1.34 +++ configure 1998/06/16 03:59:02 1.35 @@ -775,6 +775,54 @@ fi ## +## determine special configuration parameters +## +conf_group="#-1" +if [ ".`egrep ^nobody: /etc/group`" != . ]; then + conf_group="nobody" +fi +conf_port="80" +if [ ".`id | grep root`" = . ]; then + conf_port="8080" +fi +username="$LOGNAME" +if [ ".$username" = . ]; then + username="$USER" + if [ ".$username" = . ]; then + username="`whoami 2>/dev/null | sed -e 's/\n$//'`" + if [ ".$username" = . ]; then + username="`who am i 2>/dev/null | cut '-d ' -f1`" + if [ ".$username" = . ]; then + username="unknown" + fi + fi + fi +fi +hostname="`uname -n | sed -e 's/\n$//'`" +if [ ".$hostname" = . ]; then + hostname="`hostname | sed -e 's/\n$//'`" + if [ ".$hostname" = . ]; then + hostname="hostname" + fi +fi +hostname="`echo $hostname | sed -e 's/\..*//'`" +domainname=""; +if [ -f /etc/resolv.conf ]; then + domainname="`egrep '^[ ]*domain' /etc/resolv.conf |\ + sed -e 's/.*domain//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^ *//' \ + -e 's/^\.//' -e 's/^/./'`" + if [ ".$domainname" = . ]; then + domainname="`egrep '^[ ]*search' /etc/resolv.conf |\ + sed -e 's/.*search//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^ *//' \ + -e 's/ .*//' -e 's/^\.//' -e 's/^/./'`" + fi +fi +conf_serveradmin="[EMAIL PROTECTED]" +conf_servername="$hostname$domainname" + +## ## determine prefix-relative paths for directories ## because Apache supports them for the -d and -f ## options, the LoadModule directive, etc. @@ -854,6 +902,10 @@ -e "[EMAIL PROTECTED]@%$suexec%g" \ -e "[EMAIL PROTECTED]@%$suexec_caller%g" \ -e "[EMAIL PROTECTED]@%$suexec_userdir%g" \ +-e "[EMAIL PROTECTED]@%$conf_group%g" \ +-e "[EMAIL PROTECTED]@%$conf_port%g" \ +-e "[EMAIL PROTECTED]@%$conf_serveradmin%g" \ +-e "[EMAIL PROTECTED]@%$conf_servername%g" \ -e "[EMAIL PROTECTED]@%$suexec_uidmin%g" \ -e "[EMAIL PROTECTED]@%$suexec_gidmin%g" \ -e "[EMAIL PROTECTED]@%$suexec_safepath%g" \ 1.41 +10 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- Makefile.tmpl 1998/06/16 03:28:44 1.40 +++ Makefile.tmpl 1998/06/16 03:59:02 1.41 @@ -118,6 +118,12 @@ suexec_gidmin = @suexec_gidmin@ suexec_safepath = @suexec_safepath@ +# some substituted configuration parameters +conf_group = @conf_group@ +conf_port = @conf_port@ +conf_serveradmin = @conf_serveradmin@ +conf_servername = @conf_servername@ + # usage of src/support stuff build-support = @build_support@ install-support = @install_support@ @@ -382,6 +388,10 @@ -e 's;logs/referer_log;$(logfiledir)/referer_log;' \ -e 's;logs/agent_log;$(logfiledir)/agent_log;' \ -e 's;conf/magic;$(sysconfdir)/magic;' \ + -e 's;Group #-1;Group $(conf_group);' \ + -e 's;Port 80;Port $(conf_port);' \ + -e 's;ServerAdmin [EMAIL PROTECTED];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; \ 1.921 +5 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.920 retrieving revision 1.921 diff -u -r1.920 -r1.921 --- CHANGES 1998/06/16 03:53:46 1.920 +++ CHANGES 1998/06/16 03:59:08 1.921 @@ -1,5 +1,10 @@ Changes with Apache 1.3.1 + *) Let APACI's configure script determine some configuration parameters + (Group, Port, ServerAdmin, ServerName) via some intelligent tests to + remove some of the classical hurdles for new users when setting up + Apache. [Ralf S. Engelschall] + *) Added an EXTRA_DEPS configuration parameter which can be used to add an extra Makefile dependency for the httpd target, for instance to external third-party libraries, etc.