More hut netconfig

2024-11-25 00:32:01 +00:00 · 2023-03-30 03:18:37 +01:00 · 2023-03-30 03:18:37 +01:00 · 9f5aa03fe9
commit 9f5aa03fe9
parent f4ac133f62
6 changed files with 667 additions and 37 deletions
--- a/documents/favicon.ico
+++ b/documents/favicon.ico
--- a/favicon.ico
+++ b/favicon.ico
--- a/handbook/computing/WR841N.jpg
+++ b/handbook/computing/WR841N.jpg
--- a/handbook/computing/copy-of-dnsmasq.conf
+++ b/handbook/computing/copy-of-dnsmasq.conf
@ -0,0 +1,564 @@
+# Configuration file for dnsmasq.
+# THIS IS NOT THE EXACT CORRECT COPY FOR 2023
+# IT IS AN EARLIER COPY, WE ARE WAITING FOR THE UPDATED COPY TO BE COPIED HERE.
+# 29 March 2023
+#
+# Format is one option per line, legal options are the same
+# as the long options legal on the command line. See
+# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details.
+
+# The following two options make you a better netizen, since they
+# tell dnsmasq to filter out queries which the public DNS cannot
+# answer, and which load the servers (especially the root servers)
+# uneccessarily. If you have a dial-on-demand link they also stop
+# these requests from bringing up the link uneccessarily.
+
+# Never forward plain names (without a dot or domain part)
+#domain-needed
+# Never forward addresses in the non-routed address spaces.
+#bogus-priv
+
+
+# Uncomment this to filter useless windows-originated DNS requests
+# which can trigger dial-on-demand links needlessly.
+# Note that (amongst other things) this blocks all SRV requests,
+# so don't use it if you use eg Kerberos, SIP, XMMP or Google-talk.
+# This option only affects forwarding, SRV records originating for
+# dnsmasq (via srv-host= lines) are not suppressed by it.
+#filterwin2k
+
+# Change this line if you want dns to get its upstream servers from
+# somewhere other that /etc/resolv.conf
+#resolv-file=
+
+# By  default,  dnsmasq  will  send queries to any of the upstream
+# servers it knows about and tries to favour servers to are  known
+# to  be  up.  Uncommenting this forces dnsmasq to try each query
+# with  each  server  strictly  in  the  order  they   appear   in
+# /etc/resolv.conf
+#strict-order
+
+# If you don't want dnsmasq to read /etc/resolv.conf or any other
+# file, getting its servers from this file instead (see below), then
+# uncomment this.
+#no-resolv
+
+# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv
+# files for changes and re-read them then uncomment this.
+#no-poll
+
+# Add other name servers here, with domain specs if they are for
+# non-public domains.
+#server=/csg/192.168.0.200
+
+# Example of routing PTR queries to nameservers: this will send all 
+# address->name queries for 192.168.3/24 to nameserver 10.1.2.3
+#server=/3.168.192.in-addr.arpa/10.1.2.3
+
+# Add local-only domains here, queries in these domains are answered
+# from /etc/hosts or DHCP only.
+#local=/hut/
+
+# Add domains which you want to force to an IP address here.
+# The example below send any host in doubleclick.net to a local
+# webserver.
+#address=/hut/192.168.0.200
+
+# --address (and --server) work with IPv6 addresses too.
+#address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83
+
+# You can control how dnsmasq talks to a server: this forces 
+# queries to 10.1.2.3 to be routed via eth1
+# server=10.1.2.3@eth1
+
+# and this sets the source (ie local) address used to talk to
+# 10.1.2.3 to 192.168.1.1 port 55 (there must be a interface with that
+# IP on the machine, obviously).
+# server=10.1.2.3@192.168.1.1#55
+
+# If you want dnsmasq to change uid and gid to something other
+# than the default, edit the following lines.
+#user=
+#group=
+
+# If you want dnsmasq to listen for DHCP and DNS requests only on
+# specified interfaces (and the loopback) give the name of the
+# interface (eg eth0) here.
+# Repeat the line for more than one interface.
+interface=wlan0
+dhcp-range=192.168.1.10,192.168.1.199,48h
+domain=hut
+# wired network
+#interface=eth0
+#dhcp-range=10.0.1.10,10.0.1.100,48h
+#domain=wiredhut
+# Or you can specify which interface _not_ to listen on
+#interface=usb0 
+#dhcp-range=10.0.0.2,10.0.0.2,1m
+#domain=tcldomain.office
+#except-interface=
+# Or which to listen on by address (remember to include 127.0.0.1 if
+# you use this.)
+#listen-address=
+# If you want dnsmasq to provide only DNS service on an interface,
+# configure it as shown above, and then use the following line to
+# disable DHCP on it.
+no-dhcp-interface=eth0
+
+# On systems which support it, dnsmasq binds the wildcard address,
+# even when it is listening on only some interfaces. It then discards
+# requests that it shouldn't reply to. This has the advantage of
+# working even when interfaces come and go and change address. If you
+# want dnsmasq to really bind only the interfaces it is listening on,
+# uncomment this option. About the only time you may need this is when
+# running another nameserver on the same machine.
+#bind-interfaces
+
+# If you don't want dnsmasq to read /etc/hosts, uncomment the
+# following line.
+#no-hosts
+# or if you want it to read another file, as well as /etc/hosts, use
+# this.
+addn-hosts=/root/fakenet/expo/hosts
+
+# Set this (and domain: see below) if you want to have a domain
+# automatically added to simple names in a hosts-file.
+expand-hosts
+
+# Set the domain for dnsmasq. this is optional, but if it is set, it
+# does the following things.
+# 1) Allows DHCP hosts to have fully qualified domain names, as long
+#     as the domain part matches this setting.
+# 2) Sets the "domain" DHCP option thereby potentially setting the
+#    domain of all systems configured by DHCP
+# 3) Provides the domain part for "expand-hosts"
+domain=potatohut
+
+# Set a different domain for a particular subnet
+#domain=wireless.thekelleys.org.uk,192.168.2.0/24
+
+# Same idea, but range rather then subnet
+#domain=reserved.thekelleys.org.uk,192.68.3.100,192.168.3.200
+
+# Uncomment this to enable the integrated DHCP server, you need
+# to supply the range of addresses available for lease and optionally
+# a lease time. If you have more than one network, you will need to
+# repeat this for each network on which you want to supply DHCP
+# service.
+#dhcp-range=192.168.0.50,192.168.0.150,12h
+
+# This is an example of a DHCP range where the netmask is given. This
+# is needed for networks we reach the dnsmasq DHCP server via a relay
+# agent. If you don't know what a DHCP relay agent is, you probably
+# don't need to worry about this.
+#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h
+
+# This is an example of a DHCP range which sets a tag, so that
+# some DHCP options may be set only for this network.
+#dhcp-range=set:red,192.168.0.50,192.168.0.150
+
+# Use this DHCP range only when the tag "green" is set. 
+#dhcp-range=tag:green,192.168.0.50,192.168.0.150,12h
+
+# Specify a subnet which can't be used for dynamic address allocation,
+# is available for hosts with matching --dhcp-host lines. Note that
+# dhcp-host declarations will be ignored unless there is a dhcp-range
+# of some type for the subnet in question.
+# In this case the netmask is implied (it comes from the network
+# configuration on the machine running dnsmasq) it is possible to give 
+# an explict netmask instead.
+#dhcp-range=192.168.0.0,static
+ 
+# Supply parameters for specified hosts using DHCP. There are lots
+# of valid alternatives, so we will give examples of each. Note that
+# IP addresses DO NOT have to be in the range given above, they just
+# need to be on the same network. The order of the parameters in these
+# do not matter, it's permissble to give name,adddress and MAC in any order
+
+# Always allocate the host with ethernet address 11:22:33:44:55:66
+# The IP address 192.168.0.60
+#dhcp-host=11:22:33:44:55:66,192.168.0.60
+
+# Always set the name of the host with hardware address
+# 11:22:33:44:55:66 to be "fred"
+#dhcp-host=11:22:33:44:55:66,fred
+
+# Always give the host with ethernet address 11:22:33:44:55:66
+# the name fred and IP address 192.168.0.60 and lease time 45 minutes
+#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m
+
+# Give a host with ethernet address 11:22:33:44:55:66 or
+# 12:34:56:78:90:12 the IP address 192.168.0.60. Dnsmasq will assume
+# that these two ethernet interfaces will never be in use at the same
+# time, and give the IP address to the second, even if it is already
+# in use by the first. Useful for laptops with wired and wireless
+# addresses.
+#dhcp-host=11:22:33:44:55:66,12:34:56:78:90:12,192.168.0.60
+
+# Give the machine which says its name is "bert" IP address
+# 192.168.0.70 and an infinite lease
+#dhcp-host=bert,192.168.0.70,infinite
+
+# Always give the host with client identifier 01:02:02:04
+# the IP address 192.168.0.60
+#dhcp-host=id:01:02:02:04,192.168.0.60
+
+# Always give the host with client identifier "marjorie"
+# the IP address 192.168.0.60
+#dhcp-host=id:marjorie,192.168.0.60
+
+# Enable the address given for "judge" in /etc/hosts
+# to be given to a machine presenting the name "judge" when
+# it asks for a DHCP lease.
+#dhcp-host=judge
+
+# Never offer DHCP service to a machine whose ethernet
+# address is 11:22:33:44:55:66
+#dhcp-host=11:22:33:44:55:66,ignore
+
+# Ignore any client-id presented by the machine with ethernet
+# address 11:22:33:44:55:66. This is useful to prevent a machine
+# being treated differently when running under different OS's or
+# between PXE boot and OS boot.
+#dhcp-host=11:22:33:44:55:66,id:*
+
+# Send extra options which are tagged as "red" to
+# the machine with ethernet address 11:22:33:44:55:66
+#dhcp-host=11:22:33:44:55:66,set:red
+
+# Send extra options which are tagged as "red" to
+# any machine with ethernet address starting 11:22:33:
+#dhcp-host=11:22:33:*:*:*,set:red
+
+# Ignore any clients which are specified in dhcp-host lines
+# or /etc/ethers. Equivalent to ISC "deny unkown-clients".
+# This relies on the special "known" tag which is set when 
+# a host is matched.
+#dhcp-ignore=tag:!known
+
+# Send extra options which are tagged as "red" to any machine whose
+# DHCP vendorclass string includes the substring "Linux"
+#dhcp-vendorclass=set:red,Linux
+
+# Send extra options which are tagged as "red" to any machine one
+# of whose DHCP userclass strings includes the substring "accounts"
+#dhcp-userclass=set:red,accounts
+
+# Send extra options which are tagged as "red" to any machine whose
+# MAC address matches the pattern.
+#dhcp-mac=set:red,00:60:8C:*:*:*
+
+# If this line is uncommented, dnsmasq will read /etc/ethers and act
+# on the ethernet-address/IP pairs found there just as if they had
+# been given as --dhcp-host options. Useful if you keep
+# MAC-address/host mappings there for other purposes.
+#read-ethers
+
+# Send options to hosts which ask for a DHCP lease.
+# See RFC 2132 for details of available options.
+# Common options can be given to dnsmasq by name: 
+# run "dnsmasq --help dhcp" to get a list.
+# Note that all the common settings, such as netmask and
+# broadcast address, DNS server and default route, are given
+# sane defaults by dnsmasq. You very likely will not need 
+# any dhcp-options. If you use Windows clients and Samba, there
+# are some options which are recommended, they are detailed at the
+# end of this section.
+
+# Override the default route supplied by dnsmasq, which assumes the
+# router is the same machine as the one running dnsmasq.
+#dhcp-option=3,1.2.3.4
+
+# Do the same thing, but using the option name
+#dhcp-option=option:router,1.2.3.4
+
+# Override the default route supplied by dnsmasq and send no default
+# route at all. Note that this only works for the options sent by
+# default (1, 3, 6, 12, 28) the same line will send a zero-length option 
+# for all other option numbers.
+#dhcp-option=3
+
+# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5
+#dhcp-option=option:ntp-server,192.168.0.4,10.10.0.5
+
+# Set the NTP time server address to be the same machine as
+# is running dnsmasq
+#dhcp-option=42,0.0.0.0
+
+# Set the NIS domain name to "welly"
+#dhcp-option=40,welly
+
+# Set the default time-to-live to 50
+#dhcp-option=23,50
+
+# Set the "all subnets are local" flag
+#dhcp-option=27,1
+
+# Send the etherboot magic flag and then etherboot options (a string).
+#dhcp-option=128,e4:45:74:68:00:00
+#dhcp-option=129,NIC=eepro100
+
+# Specify an option which will only be sent to the "red" network
+# (see dhcp-range for the declaration of the "red" network)
+# Note that the tag: part must precede the option: part.
+#dhcp-option = tag:red, option:ntp-server, 192.168.1.1
+
+# The following DHCP options set up dnsmasq in the same way as is specified
+# for the ISC dhcpcd in
+# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt
+# adapted for a typical dnsmasq installation where the host running
+# dnsmasq is also the host running samba.
+# you may want to uncomment some or all of them if you use 
+# Windows clients and Samba.
+#dhcp-option=19,0           # option ip-forwarding off
+#dhcp-option=44,0.0.0.0     # set netbios-over-TCP/IP nameserver(s) aka WINS server(s)
+#dhcp-option=45,0.0.0.0     # netbios datagram distribution server
+#dhcp-option=46,8           # netbios node type
+
+# Send RFC-3397 DNS domain search DHCP option. WARNING: Your DHCP client
+# probably doesn't support this......
+#dhcp-option=option:domain-search,eng.apple.com,marketing.apple.com
+
+# Send RFC-3442 classless static routes (note the netmask encoding)
+#dhcp-option=121,192.168.1.0/24,1.2.3.4,10.0.0.0/8,5.6.7.8
+
+# Send vendor-class specific options encapsulated in DHCP option 43. 
+# The meaning of the options is defined by the vendor-class so
+# options are sent only when the client supplied vendor class
+# matches the class given here. (A substring match is OK, so "MSFT" 
+# matches "MSFT" and "MSFT 5.0"). This example sets the
+# mtftp address to 0.0.0.0 for PXEClients.
+#dhcp-option=vendor:PXEClient,1,0.0.0.0
+
+# Send microsoft-specific option to tell windows to release the DHCP lease
+# when it shuts down. Note the "i" flag, to tell dnsmasq to send the
+# value as a four-byte integer - that's what microsoft wants. See
+# http://technet2.microsoft.com/WindowsServer/en/library/a70f1bb7-d2d4-49f0-96d6-4b7414ecfaae1033.mspx?mfr=true
+#dhcp-option=vendor:MSFT,2,1i
+
+# Send the Encapsulated-vendor-class ID needed by some configurations of
+# Etherboot to allow is to recognise the DHCP server.
+#dhcp-option=vendor:Etherboot,60,"Etherboot"
+
+# Send options to PXELinux. Note that we need to send the options even
+# though they don't appear in the parameter request list, so we need
+# to use dhcp-option-force here. 
+# See http://syslinux.zytor.com/pxe.php#special for details.
+# Magic number - needed before anything else is recognised
+#dhcp-option-force=208,f1:00:74:7e
+# Configuration file name
+#dhcp-option-force=209,configs/common
+# Path prefix
+#dhcp-option-force=210,/tftpboot/pxelinux/files/
+# Reboot time. (Note 'i' to send 32-bit value)
+#dhcp-option-force=211,30i
+
+# Set the boot filename for netboot/PXE. You will only need 
+# this is you want to boot machines over the network and you will need
+# a TFTP server; either dnsmasq's built in TFTP server or an
+# external one. (See below for how to enable the TFTP server.)
+#dhcp-boot=pxelinux.0
+
+# Boot for Etherboot gPXE. The idea is to send two different
+# filenames, the first loads gPXE, and the second tells gPXE what to
+# load. The dhcp-match sets the gpxe tag for requests from gPXE.
+#dhcp-match=set:gpxe,175 # gPXE sends a 175 option.
+#dhcp-boot=tag:!gpxe,undionly.kpxe
+#dhcp-boot=mybootimage
+ 
+# Encapsulated options for Etherboot gPXE. All the options are
+# encapsulated within option 175
+#dhcp-option=encap:175, 1, 5b         # priority code
+#dhcp-option=encap:175, 176, 1b       # no-proxydhcp 
+#dhcp-option=encap:175, 177, string   # bus-id 
+#dhcp-option=encap:175, 189, 1b       # BIOS drive code
+#dhcp-option=encap:175, 190, user     # iSCSI username
+#dhcp-option=encap:175, 191, pass     # iSCSI password
+
+# Test for the architecture of a netboot client. PXE clients are
+# supposed to send their architecture as option 93. (See RFC 4578)
+#dhcp-match=peecees, option:client-arch, 0 #x86-32
+#dhcp-match=itanics, option:client-arch, 2 #IA64
+#dhcp-match=hammers, option:client-arch, 6 #x86-64
+#dhcp-match=mactels, option:client-arch, 7 #EFI x86-64 
+
+# Do real PXE, rather than just booting a single file, this is an
+# alternative to dhcp-boot.
+#pxe-prompt="What system shall I netboot?"
+# or with timeout before first available action is taken:
+#pxe-prompt="Press F8 for menu.", 60
+
+# Available boot services. for PXE.
+#pxe-service=x86PC, "Boot from local disk"
+
+# Loads <tftp-root>/pxelinux.0 from dnsmasq TFTP server.
+#pxe-service=x86PC, "Install Linux", pxelinux 
+
+# Loads <tftp-root>/pxelinux.0 from TFTP server at 1.2.3.4.
+# Beware this fails on old PXE ROMS.
+#pxe-service=x86PC, "Install Linux", pxelinux, 1.2.3.4 
+
+# Use bootserver on network, found my multicast or broadcast.
+#pxe-service=x86PC, "Install windows from RIS server", 1
+
+# Use bootserver at a known IP address.
+#pxe-service=x86PC, "Install windows from RIS server", 1, 1.2.3.4
+
+# If you have multicast-FTP available,
+# information for that can be passed in a similar way using options 1
+# to 5. See page 19 of
+# http://download.intel.com/design/archives/wfm/downloads/pxespec.pdf  
+
+  
+# Enable dnsmasq's built-in TFTP server
+#enable-tftp
+
+# Set the root directory for files availble via FTP.
+#tftp-root=/var/ftpd
+
+# Make the TFTP server more secure: with this set, only files owned by
+# the user dnsmasq is running as will be send over the net.
+#tftp-secure
+
+# This option stops dnsmasq from negotiating a larger blocksize for TFTP 
+# transfers. It will slow things down, but may rescue some broken TFTP
+# clients.
+#tftp-no-blocksize
+
+# Set the boot file name only when the "red" tag is set.
+#dhcp-boot=net:red,pxelinux.red-net
+
+# An example of dhcp-boot with an external TFTP server: the name and IP
+# address of the server are given after the filename.
+# Can fail with old PXE ROMS. Overridden by --pxe-service.
+#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3
+
+# Set the limit on DHCP leases, the default is 150
+#dhcp-lease-max=150
+
+# The DHCP server needs somewhere on disk to keep its lease database.
+# This defaults to a sane location, but if you want to change it, use
+# the line below.
+#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
+
+# Set the DHCP server to authoritative mode. In this mode it will barge in
+# and take over the lease for any client which broadcasts on the network,
+# whether it has a record of the lease or not. This avoids long timeouts
+# when a machine wakes up on a new network. DO NOT enable this if there's
+# the slighest chance that you might end up accidentally configuring a DHCP
+# server for your campus/company accidentally. The ISC server uses
+# the same option, and this URL provides more information:
+# http://www.isc.org/index.pl?/sw/dhcp/authoritative.php
+#dhcp-authoritative
+
+# Run an executable when a DHCP lease is created or destroyed.
+# The arguments sent to the script are "add" or "del", 
+# then the MAC address, the IP address and finally the hostname
+# if there is one. 
+#dhcp-script=/bin/echo
+
+# Set the cachesize here.
+#cache-size=150
+
+# If you want to disable negative caching, uncomment this.
+#no-negcache
+
+# Normally responses which come form /etc/hosts and the DHCP lease
+# file have Time-To-Live set as zero, which conventionally means
+# do not cache further. If you are happy to trade lower load on the
+# server for potentially stale date, you can set a time-to-live (in
+# seconds) here.
+#local-ttl=
+
+# If you want dnsmasq to detect attempts by Verisign to send queries
+# to unregistered .com and .net hosts to its sitefinder service and
+# have dnsmasq instead return the correct NXDOMAIN response, uncomment
+# this line. You can add similar lines to do the same for other
+# registries which have implemented wildcard A records.
+#bogus-nxdomain=64.94.110.11
+
+# If you want to fix up DNS results from upstream servers, use the
+# alias option. This only works for IPv4.
+# This alias makes a result of 1.2.3.4 appear as 5.6.7.8
+#alias=1.2.3.4,5.6.7.8
+# and this maps 1.2.3.x to 5.6.7.x
+#alias=1.2.3.0,5.6.7.0,255.255.255.0
+# and this maps 192.168.0.10->192.168.0.40 to 10.0.0.10->10.0.0.40
+#alias=192.168.0.10-192.168.0.40,10.0.0.0,255.255.255.0
+
+# Change these lines if you want dnsmasq to serve MX records.
+
+# Return an MX record named "maildomain.com" with target
+# servermachine.com and preference 50
+#mx-host=maildomain.com,servermachine.com,50
+
+# Set the default target for MX records created using the localmx option.
+#mx-target=servermachine.com
+
+# Return an MX record pointing to the mx-target for all local
+# machines.
+#localmx
+
+# Return an MX record pointing to itself for all local machines.
+#selfmx
+
+# Change the following lines if you want dnsmasq to serve SRV
+# records.  These are useful if you want to serve ldap requests for
+# Active Directory and other windows-originated DNS requests.
+# See RFC 2782.
+# You may add multiple srv-host lines.
+# The fields are <name>,<target>,<port>,<priority>,<weight>
+# If the domain part if missing from the name (so that is just has the
+# service and protocol sections) then the domain given by the domain=
+# config option is used. (Note that expand-hosts does not need to be
+# set for this to work.)
+
+# A SRV record sending LDAP for the example.com domain to
+# ldapserver.example.com port 389
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389
+
+# A SRV record sending LDAP for the example.com domain to
+# ldapserver.example.com port 389 (using domain=)
+#domain=example.com
+#srv-host=_ldap._tcp,ldapserver.example.com,389
+
+# Two SRV records for LDAP, each with different priorities
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,1
+#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,2
+
+# A SRV record indicating that there is no LDAP server for the domain
+# example.com
+#srv-host=_ldap._tcp.example.com
+
+# The following line shows how to make dnsmasq serve an arbitrary PTR
+# record. This is useful for DNS-SD. (Note that the
+# domain-name expansion done for SRV records _does_not
+# occur for PTR records.)
+#ptr-record=_http._tcp.dns-sd-services,"New Employee Page._http._tcp.dns-sd-services"
+
+# Change the following lines to enable dnsmasq to serve TXT records.
+# These are used for things like SPF and zeroconf. (Note that the
+# domain-name expansion done for SRV records _does_not
+# occur for TXT records.)
+
+#Example SPF.
+#txt-record=example.com,"v=spf1 a -all"
+
+#Example zeroconf
+#txt-record=_http._tcp.example.com,name=value,paper=A4
+
+# Provide an alias for a "local" DNS name. Note that this _only_ works
+# for targets which are names from DHCP or /etc/hosts. Give host
+# "bert" another name, bertrand
+#cname=bertand,bert
+
+# For debugging purposes, log each DNS query as it passes through
+# dnsmasq.
+log-queries
+
+# Log lots of extra information about DHCP transactions.
+#log-dhcp
+
+# Include a another lot of configuration options.
+#conf-file=/etc/dnsmasq.more.conf
+#conf-dir=/etc/dnsmasq.d
--- a/handbook/computing/netconfig.html
+++ b/handbook/computing/netconfig.html
@ -28,7 +28,7 @@ still upright and have not been knocked sideways.


 <h3>Expo laptops</h3>
-<p>Both expo laptops Crowley and Aziraphale use DHCP over wifi to get an IP4 address  and the identity of a DNS nameserver. Neither laptop has any other configuration.
+<p>Both expo laptops Crowley and Aziraphale use DHCP to get an IP4 address  and the identity of a DNS nameserver. Neither laptop has any other configuration.
 <p>If you connect your laptop or phone to the potato hut wifi you will connect in the same way.

 <h3>The Gasthof Wifi</h3>
@ -48,19 +48,22 @@ still upright and have not been knocked sideways.

 <p>When the netbook powers up, the script <var>/etc/init.d/fakenet</var> runs which sets everything going for the first time.

-<h4>wicd</h4>
-<p>The netbook needs to have its persistent networking set up correctly <i>in addition to the other scripts</i>. This 
-is the <a href="https://launchpad.net/wicd">wicd</a> gui program that has an icon in the top-right of the sceen in the 
-system panel. (Or search in all applications in the Internet section for the wicd application). Set the checkboxes so 
-that the netbook does not connect to any network except the StaudnGast wifi network, and also tick the 'automatically 
-reconnect' checkbox for the "StaudnGast" network.
-
-<h4>Netgear WNDR4000</h4>
+<h4>Wifi/router Netgear WNDR4000</h4>
 <p>The Netgear ethernet/wifi hub holds the radio transceiver that provides the wifi coverage inside the potato hut.
-It is configured using its web control panel (https://192.168.1.1). It has an <a href="https://manualmachine.com/netgear/wndr4000/816208-user-manual/">online manual</a> but it needs no configuration at all during expo. Just turn it on at the beginning of expo and off again at the end.
+ It has an <a href="https://manualmachine.com/netgear/wndr4000/816208-user-manual/">online manual</a> but it needs no configuration at all during expo. Just turn it on at the beginning of expo and off again at the end.
+<p>The webpage control panel (which you should never need or touch) is accessed by connecting a laptop to the wifi or using the <var>expo laptop</var> on the ethernet and bringing up a web browser to <a href="http://192.168.1.1">http://192.168.1.1</a> with username 'admin' and the usual expo cavey:beery password. The password is also written on the underneath of the box.
+
+<h5>TL-WR841N</h5>
+<figure class="onright" >
+<a href="WR841N.jpg"><img  border=1 src="WR841N.jpg"></a>
+<br><figcaption>TL-WR841N sockets and switches</figcaption>
+</figure>
+
+<p>In 2023 we will also have a backup wifi/router in Austria, a £20 <a href="https://www.expertreviews.co.uk/tp-link/1401766/tp-link-tl-wr841n-review">TL-WR841N</a> belonging to Wookey which is configured identically to the Netgear device except that the username is 'root' not 'admin'. It is to be used only if the Netgear breaks. 
+<p>One important difference is that the ethernet cable from the netbook is plugged into the blue socket on the WR841N (it is yellow on the Netgear), and the 4 white sockets on the Netgear are 4 yellow sockets on the WR841N. A word of warning: the WR841N has been flashed with new firmware and so any documentation you may read in online manuals for it will be wrong: notably the reset and wifi on/off buttons don't have any effect, and the lights don't flash in the way the manuals say they do. There is also no USB socket, no IP6, no 5Ghz, slower ethernet (100Mbps not 1Gbps) and the wifi range out to the tents is worse than the Netgear wifi.

 <h4>IP6</h4>
-<p>While you can use 5Ghz wifi and IP6 to connect within the hut, there is no IP6 connectivity to the external internet. Sorry. We are dependent on the Gasthof system for this.
+<p>While you can use 5Ghz wifi and IP6 to connect within the hut, there is no IP6 connectivity to the external internet. Sorry. We are dependent on the Gasthof system for this. Use a phone and data roaming if you want it.

 <h3>4 different 'networks'</h3>
 <p>To understand how the network is configured, you need to realise that we have to manage these different 'networks':
@ -70,7 +73,7 @@ It is configured using its web control panel (https://192.168.1.1). It has an <a
 <li><samp>10.0.x.y</samp> The network on the short bit of cable connecting the netbook with the Netgear box.
 <li>The network on the longer length of cable connecting the Netgear box with the <var>expo laptop</var> (and sometimes the printer).
 </ul>
-We bridge the hut wifi with the hut ethernet cable to the <var>expo laptop</var> so they are both <samp>192.168.1.x</samp>, but this is a matter of choice. This is configured in the netbook config files.
+We bridge the hut wifi with the hut ethernet cable to the <var>expo laptop</var> so they are both <samp>192.168.1.x</samp>, but this is a matter of choice. This is configured inside the wifi/router using the webpage control panel.

 <h4>Where the DNS happens</h4>
 <p> DNS is what connects a computer name (such as <var>expo.survex.com</var>) with an internet address (such as <samp>78.129.164.125</samp>). To make the internet work, we need to tell every laptop and phone where to find a DNS nameserver, or what machine to ask in order to get DNS queries forwarded to a DNS nameserver.
@ -84,34 +87,96 @@ We bridge the hut wifi with the hut ethernet cable to the <var>expo laptop</var>
 <li>2022 : in the Netgear box.
 </ol>
 <p>1. The benefit of doing it in the Netgear box is that you get to play with a graphical web interface not text files. But also you can test that the Netgear box is working separately from everything else.
-<p>2. The benefit of doing it in the netbook is that all the configuration is in the same place, and you only have to learn one way of doing things instead of having to use text files <em>and</em> a web interface. Aslo, by making the Netgear box completely dumb, it is swap-replaceable if it dies with no reconfiguration required.
+<p>2. The benefit of doing it in the netbook is that all the configuration is in the same place, and you only have to learn one way of doing things instead of having to use text files <em>and</em> a web interface. Also, by making the Netgear box completely dumb, it is swap-replaceable if it dies with no reconfiguration required.
+<p>The DHCP is configured to issue IP addresses with <samp>x</samp> between 2 and 199, i.e. laptops and phones will get IP addresses between <samp>192.168.1.10</samp> and <samp>192.168.1.199</samp>. These may change after 12 hours.

 <h4>Static addresses</h4>
-<p>The netbook has two network interfaces: the Alfa wifi antenna (which has an address issud by the Gasthof wifi system) plugged into a USB socket, and its ethernet cable socket which is configured to have the address <samp>10.0.1.2</samp>.
-<p>The Netgear box has its yellow ethernet cable socket set to the address <samp>10.0.1.1</samp>. The four other ethernet sockets are all on the address range <samp>192.168.1.x</samp> and the wifi network interface is set to <samp>192.168.1.1</samp> on the same network range.
+<p>The netbook has two network interfaces: the Alfa wifi antenna (which has an address issued by the Gasthof wifi system) plugged into a USB socket, and its ethernet cable socket which is configured to have the address <samp>10.0.1.2</samp>.
+<p>The Netgear box has its yellow ethernet cable socket set to the address <samp>10.0.1.1</samp>. The four other ethernet sockets are all on the address range <samp>192.168.1.x</samp> and the wifi network interface is set to <samp>192.168.1.1</samp> also in the network <samp>192.168.1.x</samp>.
+
+<p>So the ethernet cable between the Netgear box and the netbook is  <samp>10.0.1.1</samp> at the Netgear end and <samp>10.0.1.2</samp> at the netbook end. Nothing else uses any number like <samp>10.0.x.y</samp>.
+
+
+
+<h4 style="color: red">When it all goes wrong</h4>
+<p>If everything is working between devices in the hut, but there is no internet access, then the <b>first thing to check</b> is that
+the black WiFi antennae on the small black Alfa box are still upright and have not been knocked sideways.
+
+<p>The next thing is to take a phone out to the road and try to connect directly to the Gasthof wifi. This is to check that the Gasthof is on the internet and that the problem is not between the Gasthof and the rest of the world.
+
+<p>You test whether the internet is running by trying to visit <a href="http://www.google.com">www.google.com</a> or
+<a href="https://github.com">github.com</a>.
+
+<p>The netbook attempts a reconnection every 60 seconds, so wait at least 2 minutes before doing anything. That is because when the netbook attempts a full reconnection it can take nearly a minute to rebuild everything.
+
+<p>Test whether the netbook is actually running and responding by sitting at the <var>expo laptop</var> and logging into the netbook remotely. Do this in a terminal window:
+<pre><code>ssh expo@10.0.1.2</code></pre>
+or
+<pre><code>ssh expo@tclaspire3.hut</code></pre>
+<p>If you get a login prompt, the netbook is running. It is a slow machine so do not expect this to be instant.
+<p>Login (as user 'expo' using the cavey:beery password) and type this at a prompt:
+<pre><code>/root/fakenet/runfakenet</code></pre>
+which will run the script to reconnect. This may take a minute to have the desired effect.
+
+<p>If you didn't get a prompt when you attempted to login from the <var>expo laptop</var> then you will need to do the same thing but actually on the netbook keyboard. While you are at it, it would be a good idea to re-boot the netbook first by typing this on the netbook keyboard first, and waiting for it to re-boot:
+<pre><code>shutdown --reboot</code></pre>
+<p>You may also need to re-enable wicd, see below.
+
+<p>If it keeps failing, then maybe the <var>cron</var> system which re-triggers it every 60s is not working. That is probably a symptom of something more much more serious wrong with the netbook if you have already re-booted it. Try re-booting it again and this time be more patient. <em>Report this</em> to a nerd and <em>write a record of the problem in the expo logbook</em>.
+
+<h4>wicd</h4>
+<p>The netbook needs to have its persistent networking set up correctly <i>in addition to the other scripts</i>. This 
+is the <a href="https://launchpad.net/wicd">wicd</a> gui program that has an icon in the top-right of the sceen in the 
+system panel. (Or search in all applications in the Internet section for the <var>wicd</var> application). Set the checkboxes so 
+that the netbook does not connect to any network except the StaudnGast wifi network, and also tick the 'automatically 
+reconnect' checkbox for the "StaudnGast" network.

 <h2>The scripts</h2>
-<p>
+<p>For the curious or desperate, here is how the scripts actually work.
+<p>The <var>/root/fakent/expo/hosts</var> file is just two lines:
+<pre><code>10.0.1.2 tclapsire3
+10.0.1.1 router
+</code></pre>
+<p>The file that configures the wifi is the file <var>/root/fakent/expo/hostapd.conf</var>
+<pre><code>interface=wlan0
+driver=nl80211
+ssid=tattyhut
+hw_mode=g
+channel=1
+macaddr_acl=0
+ignore_broadcast_ssid=0
+auth_algs=1
+wpa=3
+wpa_passphrase=CAVEYBEERYPASSWORD
+wpa_key_mgmt=WPA-PSK
+wpa_pairwise=TKIP
+rsn_pairwise=CCMP
+</code></pre>
+where CAVEYBEERYPASSWORD is our usual expo password. In 2022 this capability was configured by the Netgear control panel, not by this file on the netbook.

-<strike>
-<p>Because the netbook is on a different network from the laptops connecting to the hut wifi, you can't directly login to the netbook using <var>ssh</var> to the IP address (ssh expo@10.0.1.2), but you can using its name, so <var> ssh expo@tclaspire3.potatohut</var> should work if everything has been configured correctly.
-<p>
-This is the address to use for configuring it using ssh when everything else has failed. So to manage the
-connection to the Gasthof WiFi you would use
-<pre>
-ssh expo@192.168.200.100
-</pre>
+<p>The file that configures the DNS and DHCP is <var>/root/fakent/expo/dnamasq.conf</var> and it is very long with most of the lines commented out with an initial '#', so they are not all listed here. (You can read a copy of it <a href="copy-of-dnsmasq.conf">here</a>). On the netbook 'eth0' is the interface with the antenna (which is actually a USB socket) and 'wlan0' is the ethernet socket interface to the cable to the Netgear box. Some of the more relevant lines are:
+<pre><code>interface=wlan0
+dhcp-range=192.168.1.10,192.168.1.199,12h
+addn-hosts=/root/fakenet/expo/hosts
+expand-hosts
+domain=potato.hut
+no-dhcp-interface=eth0
+</code></pre>
+Note the line <var>addn-hosts=/root/fakenet/expo/hosts</var> which refers to the first file listed above which defines the names of the machines for the two ends of the cable between the netbook and the  Netgear box.
+<p>The line that configures <var>crontab</var> to run the fakenet script every 60 seconds is
+<pre><code>MISSING
+MISSING - need to get this...
+</code></pre>
+<p>The actual fakenet script is
+<pre><code>MISSING
+MISSING - need to get this...
+</code></pre>
+<p> The init script which configures everything when the netbook is booted up is
+<pre><code>MISSING
+MISSING - need to get this...
+</code></pre>

-<pre>/root/fakenet/runfakenet
-</pre>
-This used to need running once or twice a day when the internet stops working, but it was radically fettled in 2022 and so should be much more reliable. 
-Sometimes you may have to walk over to the blue Acer Aspire netbook and run this script directly by typing on its keyboard
-as the network has collapsed so badly that <span style="font-family:monospace">ssh</span> doesn't work.
-
-
-</strike>
-
-<h3>Historical Notes</h3>
+<h2>Historical Notes</h2>

 <p>Prior to 2017 we used to run an unconnected local network with our own DNS domain 
 name "potato.hut", our own server holding all the website and survey data, and published WiFi as SSID "tattyhut". 
@ -125,11 +190,11 @@ pushing the changes to the distributed version control system on
 the internet continuously and not to have our own local server. This coincided with a much-improved WiFi service at 
 the Gasthof. We continued with the wifi service in the hut but now it also connects to the external internet instead of to a 'pretend' internet (which is why the system is called 'fakenet').

-<p>In 2018 and 2019 we had good Internet access at basecamp, but the high-gain system  was returned to its owner during Covid.
-<p>In 2022 Wifi reception from the Gasthof was very poor. The connection script was improved so that dropped connections were restored more quickly. However the basic bandwidth with a cheap antenna was not enough.
+<p>In 2018 and 2019 we had good Internet access at basecamp, but the high-gain system  was returned to its owner (Sam) during Covid (2020-21). Wookey bought a new one, which proved to not live up to its advertising.
+<p>In 2022 Wifi reception from the Gasthof was very poor. The connection script was improved so that dropped connections were restored more quickly. However the basic bandwidth with the new cheap antenna was not enough.
 <p>In 2023 a new Wifi device (the Alfa) should restore decent connectivity. We hope this will improve everything to how it was in 2019. However this Alfa has proved to be a right bastard to find the right drivers for. Wookey has had to be inventive in using an Ubuntu PPA to make it work with the Acer Aspire 1.

-<p>Also during winter 2023/23 Wookey upgraded the operating system on the Acer Aspire One netbook from whatever  ancient Debian it had been running to a decently almost-modern Debian distribution. This required much coaxing. As of 26 March, it is still a couple of Debian versions behind where we would want it to be.
+<p>Also during winter 2023/23 Wookey upgraded the operating system on the Acer Aspire One netbook from the ancient Debian Wheezy it had been running to a decently almost-modern Debian distribution. This required much coaxing. 

 <h4>History of the scripts</h4>
 <p>The structure of the system was created by Wookey in 2013 who used the fakenet principle and the netbook to run training sessions for the Cave Survey Group in the UK. [This is why the script has an extra level of parameter setting that might seem necessary: it has 'csg' and 'expo' options, but the two configurations have diverged so much over the years that this is merely a fossil.]
--- a/handbook/l/hut-cables.html
+++ b/handbook/l/hut-cables.html
@ -35,6 +35,7 @@
 <li>Powerbrick for R61 Thinkpad (Aziraphale)
 <li>Powerbrick for <a href="../i/wndr4000.jpg">Netgear WNDR4000</a> wifi/ethernet device
 </ol>
+<p>[Actually there may be 5 power bricks: the USB hub may need power too.]
 <p>The Acer Aspire One (tclaspire3) and Dell E4200 (Crowley) each have internal, built-in wifi, but we do not use these and they are turned off (with a physical sliding-switch on the case) to reduce confusion.
 <p>Aziraphale also has an ethernet socket and can be connected by ethernet cable to the network if convenient and if within-hut wifi is congested.
 <p>The mains power plugs are illustrated with 2 pins for clarity, but they are all 3-pin UK-style pugs in reality.