From 9157934d7e8e4638145e476f3278d4db13a439b8 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Thu, 23 Feb 2017 17:59:34 +0100 Subject: [PATCH] Move ITS configuration to a directory called conf. --- Makefile | 12 ++---------- README.md | 7 ++++--- conf/README | 5 +++++ conf/hosts | 1 + conf/network | 10 ++++++++++ 5 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 conf/README create mode 100644 conf/hosts create mode 100644 conf/network diff --git a/Makefile b/Makefile index 839feebd..9d867cb3 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,6 @@ EMULATOR ?= simh -# Network configuration for ITS. Note: for now, the two-letter ITS -# name is hardcoded to DB, which is short for DistriBution. -HOSTNAME=DB-ITS.EXAMPLE.COM -IP=192.168.1.100 -GW=192.168.0.45 -NETMASK=255,255,255,248 -CHAOS=no #Or octal Chaosnet address -CHAFRIENDS=chip=3150/no.nocrew.org \ - chip=3143/up.update.uu.se \ - chip=7100/sj.gewt.net +include conf/network # The directores listed in SRC, DOC, and BIN are put on the sources tape. SRC = system syseng sysen1 sysen2 sysen3 sysnet kshack dragon channa \ @@ -89,6 +80,7 @@ src/syshst/$(H3TEXT): build/$(H3TEXT) sed -e 's/%IP%/$(IP)/' \ -e 's/%HOSTNAME%/$(HOSTNAME)/' \ -e "s/%CHAOS%/$$c/" < $< > $@ + cat conf/hosts >> $@ $(KLH10): cd tools/klh10; \ diff --git a/README.md b/README.md index 43215a8e..1b2c6ee8 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ six-character parts separated by a period. Here is an overview of the repository: - bin - PDP-10 binary files necessary to bootstrap the system. - build - build scripts. +- conf - configuration for building ITS. - doc - documentation, most of which appear in the INFO system. - src - source code for ITS and all programs. - tools - build tools. @@ -276,6 +277,6 @@ matches the address configured in SYSTEM; CONFIG > (as IMPUS3). Finally, the HOST table source (SYSHST; H3TEXT >) and binary (SYSBIN; HOSTS3 >) defined a host called DB-ITS.EXAMPLE.COM at the IP address 192.168.1.100. -In order to change the IP address of the host, you can edit the -top-level Makefile variables IP, GW, and NETMASK. After that, a full -rebuild (e.g. `make clean all`) is required. +In order to change the IP address of the host, you can edit IP, GW, +and NETMASK in the file conf/network. You can also set a Chaosnet +address. After that, a full rebuild (e.g. `make clean all`) is required. diff --git a/conf/README b/conf/README new file mode 100644 index 00000000..b215edd5 --- /dev/null +++ b/conf/README @@ -0,0 +1,5 @@ +This directory contains files with information to configure +the build of ITS. + +network - Network configuration. +hosts - Added to the hosts table. diff --git a/conf/hosts b/conf/hosts new file mode 100644 index 00000000..1fcb6780 --- /dev/null +++ b/conf/hosts @@ -0,0 +1 @@ +; Additional hosts. Use H3TEXT format. diff --git a/conf/network b/conf/network new file mode 100644 index 00000000..e2f5e182 --- /dev/null +++ b/conf/network @@ -0,0 +1,10 @@ +# Network configuration for ITS. Note: for now, the two-letter ITS +# name is hardcoded to DB, which is short for DistriBution. +HOSTNAME=DB-ITS.EXAMPLE.COM +IP=192.168.1.100 +GW=192.168.0.45 +NETMASK=255,255,255,248 +CHAOS=no #Or octal Chaosnet address +CHAFRIENDS=chip=3150/no.nocrew.org \ + chip=3143/up.update.uu.se \ + chip=7100/sj.gewt.net