diff options
| -rw-r--r-- | NWGNUmakefile | 10 | ||||
| -rw-r--r-- | build/NWGNUenvironment.inc | 8 | ||||
| -rw-r--r-- | build/mkconfNW.awk | 11 |
3 files changed, 19 insertions, 10 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 4cdcb88b20..cd74c31b2c 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -337,11 +337,7 @@ install :: nlms FORCE -copy CHANGES $(INSTALL)\$(BASEDIR)\*.* -copy support\dbmmanage.in $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl -copy support\logresolve.pl.in $(INSTALL)\$(BASEDIR)\bin\logresolve.pl -ifdef USE_STDSOCKETS - -$(AWK) -v BDIR=$(BASEDIR) -v MODSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf -else - -$(AWK) -v BDIR=$(BASEDIR) -v NWSSL=1 -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf -endif + -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs\conf\httpd.conf.in >$(INSTALL)\$(BASEDIR)\conf\httpd.conf $(CHKNOT) $(INSTALL)\$(BASEDIR)\conf\extra\nul mkdir $(INSTALL)\$(BASEDIR)\conf\extra -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-autoindex.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-autoindex.conf -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-dav.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-dav.conf @@ -351,9 +347,9 @@ endif -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-manual.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-manual.conf -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-mpm.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-mpm.conf -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-multilang-errordoc.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-multilang-errordoc.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.conf -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-userdir.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-userdir.conf - -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.conf + -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build\mkconfnw.awk docs\conf\extra\httpd-vhosts.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-vhosts.conf + -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build\mkconfnw.awk docs\conf\extra\httpd-ssl.conf.in >$(INSTALL)\$(BASEDIR)\conf\extra\httpd-ssl.conf -copy docs\conf\magic $(INSTALL)\$(BASEDIR)\conf\magic -copy docs\conf\mime.types $(INSTALL)\$(BASEDIR)\conf\mime.types -copy docs\conf\charset.conv $(INSTALL)\$(BASEDIR)\conf\charset.conv diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 18398de449..a6b7a06988 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -218,6 +218,14 @@ ifndef BASEDIR BASEDIR = Apache2 endif +ifndef PORT +PORT = 80 +endif + +ifndef SSLPORT +SSLPORT = 443 +endif + # Add support for building IPV6 alongside ifneq "$(IPV6)" "" DEFINES += -DNW_BUILD_IPV6 diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk index 1b9f4cc396..0bb7baf93b 100644 --- a/build/mkconfNW.awk +++ b/build/mkconfNW.awk @@ -16,7 +16,8 @@ BEGIN { A["ServerRoot"] = "SYS:/"BDIR - A["Port"] = "80" + A["Port"] = PORT + A["SSLPort"] = SSLPORT A["cgidir"] = "cgi-bin" A["logfiledir"] = "logs" A["htdocsdir"] = "htdocs" @@ -93,6 +94,10 @@ BEGIN { next } +match ($0,/443/) { + sub(/443/, SSLPORT) +} + match ($0,/^#SSLSessionCache +"dbm:/) { sub(/^#/, "") } @@ -131,7 +136,7 @@ match ($0,/@nonssl_.*@/) { END { - if (NWSSL) { + if (!BSDSKT) { print "" print "#" print "# SecureListen: Allows you to securely bind Apache to specific IP addresses " @@ -140,7 +145,7 @@ END { print "# Change this to SecureListen on specific IP addresses as shown below to " print "# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)" print "#" - print "#SecureListen 443 \"SSL CertificateDNS\"" + print "#SecureListen "SSLPORT" \"SSL CertificateDNS\"" print "" } } |