Mercurial > hg > Members > kono > nitros9-code

changeset 2825:99fac4bd9c41 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated makefiles in sys and inetd.conf to establish HTTPD port
author Boisy Pitre <boisy.pitre@nuance.com>
date Thu, 23 May 2013 10:08:57 -0500
parents 1647f1874cdf
children e76cc015cc03
files level1/atari/cmds/makefile level1/atari/makefile level1/atari/sys/makefile level1/coco1/makefile level1/coco1/sys/makefile level1/coco2/sys/makefile level1/coco2b/sys/makefile level1/deluxe/sys/Makefile level1/sys/inetd.conf
diffstat 9 files changed, 32 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/level1/atari/cmds/makefile	Thu May 23 05:49:13 2013 -0500
+++ b/level1/atari/cmds/makefile	Thu May 23 10:08:57 2013 -0500
@@ -7,7 +7,7 @@
 DEPENDS		= ./makefile
 
 AFLAGS          += --includedir=$(NITROS9DIR)/3rdparty/packages/basic09
-LFLAGS          += -L $(NITROS9DIR)/lib -lnet -lcoco -lalib
+LFLAGS          += -L $(NITROS9DIR)/lib -lnet -latari -lalib
 
 BASIC09FILES	= basic09.asm runb.asm gfx.asm inkey.asm syscall.asm
 CMDS		= asm attr backup binex build calldbg cmp copy cputype \
@@ -19,7 +19,7 @@
 		tee tmode touch tsmon tuneport unlink verify xmode\
           basic09 runb gfx inkey syscall 
 
-CMDS_DW		= inetd telnet dw
+CMDS_DW		= inetd telnet dw httpd
 
 CMDS_DEMO      = fuji
 
--- a/level1/atari/makefile	Thu May 23 05:49:13 2013 -0500
+++ b/level1/atari/makefile	Thu May 23 10:08:57 2013 -0500
@@ -61,6 +61,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,WWWROOT
+	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
--- a/level1/atari/sys/makefile	Thu May 23 05:49:13 2013 -0500
+++ b/level1/atari/sys/makefile	Thu May 23 10:08:57 2013 -0500
@@ -1,6 +1,7 @@
 PORT = atari
 include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6802
+TELNET_PORT	= 6800
+HTTPD_PORT	= 6801
 
 vpath %.hp	$(LEVEL1)/sys
 
@@ -24,7 +25,7 @@
 
 
 inetd.conf:	$(LEVEL1)/sys/inetd.conf
-	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@
 
 all:	$(ALLOBJS) $(DEPENDS)
 
--- a/level1/coco1/makefile	Thu May 23 05:49:13 2013 -0500
+++ b/level1/coco1/makefile	Thu May 23 10:08:57 2013 -0500
@@ -109,6 +109,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,WWWROOT
+	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -162,6 +164,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,WWWROOT
+	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -215,6 +219,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,WWWROOT
+	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -268,6 +274,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,WWWROOT
+	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -321,6 +329,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,WWWROOT
+	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
@@ -374,6 +384,8 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
+	$(MAKDIR) $@,WWWROOT
+	os9 dsave -e wwwroot $@,WWWROOT
 	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
--- a/level1/coco1/sys/makefile	Thu May 23 05:49:13 2013 -0500
+++ b/level1/coco1/sys/makefile	Thu May 23 10:08:57 2013 -0500
@@ -2,7 +2,8 @@
         PORT=coco1
 endif
 include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6803
+TELNET_PORT	= 6810
+HTTPD_PORT	= 6811
 
 vpath %.hp	$(LEVEL1)/sys
 
@@ -28,7 +29,7 @@
 all:	$(ALLOBJS) $(DEPENDS)
 
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
-	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@
 
 alldragon: $(ALLOBJS)
 
--- a/level1/coco2/sys/makefile	Thu May 23 05:49:13 2013 -0500
+++ b/level1/coco2/sys/makefile	Thu May 23 10:08:57 2013 -0500
@@ -2,7 +2,8 @@
         PORT=coco1
 endif
 include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6804
+TELNET_PORT	= 6820
+HTTPD_PORT	= 6821
 
 vpath %.hp	$(LEVEL1)/sys
 
@@ -28,7 +29,7 @@
 all:	$(ALLOBJS) $(DEPENDS)
 
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
-	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@                         
 
 helpmsg: $(HELPFILES)
 	$(MERGE) $^ > $@
--- a/level1/coco2b/sys/makefile	Thu May 23 05:49:13 2013 -0500
+++ b/level1/coco2b/sys/makefile	Thu May 23 10:08:57 2013 -0500
@@ -2,7 +2,8 @@
         PORT=coco1
 endif
 include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6805
+TELNET_PORT	= 6830
+HTTPD_PORT	= 6831
 
 vpath %.hp	$(LEVEL1)/sys
 
@@ -28,7 +29,7 @@
 all:	$(ALLOBJS) $(DEPENDS)
 
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
-	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@                         
 
 helpmsg: $(HELPFILES)
 	$(MERGE) $^ > $@
--- a/level1/deluxe/sys/Makefile	Thu May 23 05:49:13 2013 -0500
+++ b/level1/deluxe/sys/Makefile	Thu May 23 10:08:57 2013 -0500
@@ -2,7 +2,8 @@
         PORT=coco1
 endif
 include $(NITROS9DIR)/rules.mak
-TELNET_PORT	= 6805
+TELNET_PORT	= 6840
+HTTPD_PORT	= 6841
 
 vpath %.hp	$(LEVEL1)/sys
 
@@ -28,7 +29,7 @@
 all:	$(ALLOBJS) $(DEPENDS)
 
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
-	@sed 's/%TELNET_PORT%/$(TELNET_PORT)/' $^ > $@
+	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@                         
 
 helpmsg: $(HELPFILES)
 	$(MERGE) $^ > $@
--- a/level1/sys/inetd.conf	Thu May 23 05:49:13 2013 -0500
+++ b/level1/sys/inetd.conf	Thu May 23 10:08:57 2013 -0500
@@ -1,11 +1,5 @@
 # inetd configuration file format:
 # ListenPort <server opts>,Process,Params
 # valid server options are: telnet auth protect banner 
-
-# the follow line causes inetd to listen on port 6809 and spawn 'login' for a new connection
-# the options cause telnet protocol processing on the server, they use the server's IP address and geolocation protection
-# to prevent undesired hosts from connecting, and cause the server to display a banner to the client prior to announcing
-# the connection to the coco. Adding auth would cause the server to use it's own authentication prior to connecting the coco
-# (this feature may be removed in favor of a more secure coco side authentication solution)
-
 %TELNET_PORT% telnet protect banner,login,
+%HTTPD_PORT%,httpd,