Move the hotspot net from 10.42.0.0/24 to 41

Closes #52

Remove a conflict with a host which is also sharing a hotspot
created by NetworkManager.

README.md

@@ -26,7 +26,7 @@ _ht​tp://comitup.local_ or _ht​tp://comitup-<nn>.local_
 from any device which supports [Bonjour/ZeroConf/Avahi][zeroconf]. For
 other devices, use a Zeroconf browser ([Android][], [Windows][]) to
 determine the IP address of the "Comitup Service", and browse to
-_http://<ipaddress>_. In most cases, this address will be _http://10.42.0.1/_
+_http://<ipaddress>_. This address will be _http://10.41.0.1/_
 
 If two wifi interfaces are available, the first will persistently remain
 the hotspot, and the second will get the external connection. When both

comitup/nm.py

@@ -268,7 +268,7 @@ def make_hotspot(name='comitup', device=None, password="", hash="0000"):
             'method': 'manual',
             'address-data': [
                 {
-                    'address': '10.42.0.1',
+                    'address': '10.41.0.1',
                     'prefix': 24,
                 }
             ]

conf/dns-connected.conf

@@ -1,6 +1,6 @@
-dhcp-range=10.42.0.100,10.42.0.150,10m
+dhcp-range=10.41.0.100,10.41.0.150,10m
 bogus-priv
 domain-needed
-dhcp-option=6,10.42.0.1
+dhcp-option=6,10.41.0.1
 dhcp-leasefile=/var/lib/comitup/dhcpleaseinfo
 pid-file=/var/run/comitup-dns

conf/dns-hotspot.conf

@@ -1,8 +1,8 @@
-address=/#/10.42.0.1
+address=/#/10.41.0.1
 auth-ttl=0
-dhcp-option=160,http://10.42.0.1/
-dhcp-option=6,10.42.0.1
-dhcp-range=10.42.0.100,10.42.0.150,10m
+dhcp-option=160,http://10.41.0.1/
+dhcp-option=6,10.41.0.1
+dhcp-range=10.41.0.100,10.41.0.150,10m
 bogus-priv
 domain-needed
 dhcp-leasefile=/var/lib/comitup/dhcpleaseinfo

doc/comitup.8.md

@@ -33,7 +33,7 @@ _comitup-<nn>.local_, making the web service accessible
 as e.g. _http://comitup-1234.local_, for systems supporting Zeroconf. For other
 systems, a _comitup_ Workstation entry is published which is visible to Zeroconf
 browsing applications, allowing the IP address to be manually determined.
-The web service address is likely _http://10.42.0.1_.
+The web service address is _http://10.41.0.1_.
 
 **comitup** logs to _/var/log/comitup.log_.
 

web/comitupweb.py

@@ -112,7 +112,7 @@ def favicon(path):
 
     @app.route("/<path:path>")
     def catch_all(path):
-        return redirect("http://10.42.0.1/", code=302)
+        return redirect("http://10.41.0.1/", code=302)
 
     return app