Merge branch 'master' into release

1 files changed, 35 insertions, 13 deletions

diff --git a/tools/conf/etc/dnsmasq.conf b/tools/conf/etc/dnsmasq.conf
index e8bec3e..b6267fa 100644
--- a/tools/conf/etc/dnsmasq.conf
+++ b/tools/conf/etc/dnsmasq.conf
@@ -21,6 +21,9 @@ domain-needed
 # Never forward addresses in the non-routed address spaces.
 bogus-priv
 
+# Multiple address for same domain based on interface
+localise-queries
+
 # Uncomment these to enable DNSSEC validation and caching:
 # (Requires dnsmasq to be built with DNSSEC option.)
 #conf-file=%%PREFIX%%/share/dnsmasq/trust-anchors.conf
@@ -66,12 +69,13 @@ no-poll
 # Add other name servers here, with domain specs if they are for
 # non-public domains.
 #server=/localnet/192.168.0.1
-#server=127.0.0.1#40
+#server=10.0.0.4#40
 #server=213.73.91.35
 #server=37.235.1.174
 #server=84.200.69.80
 #sapo
 server=212.55.154.174
+#server=8.8.8.8
 
 # 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
@@ -84,7 +88,9 @@ local=/ank/
 # Add domains which you want to force to an IP address here.
 # The example below send any host in double-click.net to a local
 # web-server.
-address=/machine.example.org/10.0.0.4
+address=/tribu.semdestino.org/10.0.0.4
+#host-record=tribu.semdestino.org,10.0.0.4
+#host-record=tribu.semdestino.org,192.168.1.67
 
 # --address (and --server) work with IPv6 addresses too.
 #address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83
@@ -115,15 +121,15 @@ group=root
 # Repeat the line for more than one interface.
 interface=lo
 interface=br0
-#interface=wlp7s0
+interface=wlp7s0
 
 # Or you can specify which interface _not_ to listen on
 #except-interface=wlp7s0
 #except-interface=enp8s0
 
-# Or which to listen on by address (remember to include 127.0.0.1 if
+# Or which to listen on by address (remember to include 10.0.0.4 if
 # you use this.)
-#listen-address=127.0.0.1
+#listen-address=10.0.0.4
 #listen-address=10.0.0.254
 #listen-address=192.168.1.33
 
@@ -131,7 +137,7 @@ interface=br0
 # configure it as shown above, and then use the following line to
 # disable DHCP and TFTP on it.
 no-dhcp-interface=lo
-#no-dhcp-interface=wlp7s0
+no-dhcp-interface=wlp7s0
 #no-dhcp-interface=enp8s0
 
 # On systems which support it, dnsmasq binds the wildcard address,
@@ -171,11 +177,17 @@ dhcp-option=15,ank
 # Same idea, but range rather then subnet
 #domain=reserved.thekelleys.org.uk,192.68.3.100,192.168.3.200
 
-address=/.akamai.net/127.0.0.1
-address=/.firefox.com/127.0.0.1
-address=/.google.com/127.0.0.1
-address=/.stripe.com/127.0.0.1
-address=/.mozilla.com/127.0.0.1
+address=/.akamai.net/10.0.0.4
+address=/.akamaitechnologies.com/10.0.0.4
+address=/.firefox.com/10.0.0.4
+#address=/.google.com/10.0.0.4
+address=/.stripe.com/10.0.0.4
+address=/.mozilla.com/10.0.0.4
+address=/.amazonaws.com/10.0.0.4
+address=/.amazontrust.com/10.0.0.4
+address=/.1e100.net/10.0.0.4
+address=/.1e100.net/10.0.0.4
+address=/.ank.sec-t4net-srv/10.0.0.4
 
 # Uncomment this to enable the integrated DHCP server, you need
 # to supply the range of addresses available for lease and optionally
@@ -262,6 +274,8 @@ dhcp-host=00:14:BF:6E:61:21,lan,10.0.0.2,infinite
 dhcp-host=54:60:be:ef:5c:54,c1,10.0.0.3,infinite
 dhcp-host=54:60:be:ef:5c:14,c2,10.0.0.4,infinite
 dhcp-host=54:60:be:ef:5c:a1,c18,10.0.0.5,infinite
+dhcp-host=00:08:02:04:7f:9d,c30,10.0.0.6,infinite
+dhcp-host=e0:cb:4e:99:eb:f2,c40,10.0.0.7,infinite
 # 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
@@ -362,11 +376,13 @@ dhcp-host=54:60:be:ef:5c:a1,c18,10.0.0.5,infinite
 # end of this section.
 
 dhcp-option=1,255.0.0.0
+#dhcp-option=1,10.255.255.255
 
 # Override the default route supplied by dnsmasq, which assumes the
 # router is the same machine as the one running dnsmasq.
 #dhcp-option=3,10.0.0.1
 dhcp-option=3,10.0.0.1
+#dhcp-option=3,10.0.0.254
 
 # Do the same thing, but using the option name
 #dhcp-option=option:router,1.2.3.4
@@ -445,6 +461,7 @@ dhcp-option=6,10.0.0.254,10.0.0.254
 # 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
 dhcp-option=33,10.0.0.1
+#dhcp-option=33,10.0.0.254
 
 # Send vendor-class specific options encapsulated in DHCP option 43.
 # The meaning of the options is defined by the vendor-class so
@@ -481,7 +498,8 @@ dhcp-option=33,10.0.0.1
 # 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
+dhcp-boot=pxelinux/pxelinux.0
+#dhcp-boot=efi/BOOTX64.efi
 
 # The same as above, but use custom tftp-server instead machine running dnsmasq
 #dhcp-boot=pxelinux,server.name,192.168.1.100
@@ -538,10 +556,11 @@ dhcp-option=33,10.0.0.1
 
 
 # Enable dnsmasq's built-in TFTP server
-#enable-tftp
+enable-tftp
 
 # Set the root directory for files available via FTP.
 #tftp-root=/var/ftpd
+tftp-root=/srv/tftp
 
 # Do not abort if the tftp-root is unavailable
 #tftp-no-fail
@@ -629,9 +648,12 @@ local-ttl=60
 # Return an MX record named "maildomain.com" with target
 # servermachine.com and preference 50
 #mx-host=maildomain.com,servermachine.com,50
+#mx-host=tribu.semdestino.org,c2.ank,50
+mx-host=tribu.semdestino.org,10.0.0.4,50
 
 # Set the default target for MX records created using the localmx option.
 #mx-target=servermachine.com
+#mx-target=c2.ank
 
 # Return an MX record pointing to the mx-target for all local
 # machines.