Add demo configuration examples in confs folder

demo/clone.conf

@@ -8,13 +8,15 @@
 # |  111a5e4  |  513   | 17/10/2018     |          | v1.6.2-nxd1 | 2.3.18  |
 # |  4397261  |  551   | 13/01/2020     |          | hmac-nxd2   | 2.4.7   |
 
-#re6stnet m1 commit 4397261
-#re6stnet m2 commit 4397261
-#re6stnet m4 commit 4397261
-#re6stnet m5 commit 4397261
-#re6stnet m6 commit 4397261
-#re6stnet m7 commit 4397261
-#re6stnet m8 commit 4397261
+re6stnet m1 commit 4397261
+re6stnet m2 commit 4397261
+re6stnet m3 commit 4397261
+re6stnet m4 commit 4397261
+re6stnet m5 commit 4397261
+re6stnet m6 commit 4397261
+re6stnet m7 commit 4397261
+re6stnet m8 commit 4397261
+re6stnet m9 commit 4397261
 
 # Babeld
 

demo/confs/current/clone.conf

+# Re6st
+
+# | Commit    | Commit |     Date       | babeld   | babeld      | OpenVPN |
+# |           | number |                | commit   | version     |         |
+# | --------- | ------ | -------------- | -------- | ----------- | ------- |
+# |  cc3b779  |  451   | 21/01/2016     | 284612ac | v1.6.2-nxd1 |         |
+# |  4fda2dc  |  501   | 03/07/2018     |          | v1.6.2-nxd1 | 2.3.18  |
+# |  111a5e4  |  513   | 17/10/2018     |          | v1.6.2-nxd1 | 2.3.18  |
+# |  4397261  |  551   | 13/01/2020     |          | hmac-nxd2   | 2.4.7   |
+# |  85d77bd  |  556   | 13/01/2020     |          | hmac-nxd2   | 2.4.7   |
+
+#re6stnet registry commit 4397261
+#re6stnet m1 commit 4397261
+#re6stnet m2 commit 4397261
+#re6stnet m3 commit 4397261
+re6stnet m4 commit 4397261
+#re6stnet m5 commit 4397261
+#re6stnet m6 commit 4397261
+#re6stnet m7 commit 4397261
+#re6stnet m8 commit 4397261
+#re6stnet m9 commit 4397261
+
+# Babeld
+
+#babeld m2 commit v1.6.2-nxd1
+#babeld m3 commit v1.6.2-nxd1
+#babeld m6 commit v1.6.2-nxd1
+
+# OpenVPN
+
+#openvpn m2 commit v2.3.18
+#openvpn m3 commit v2.3.18
+#openvpn m6 commit v2.3.18

demo/confs/current/re6st-registry_global.conf

+@ALL
+  key %/ca.key
+  logfile %/%.log
+  run %/run
+  dh dh2048.pem
+  hello 4
+  client-count 2
+  tunnel-refresh 100
+  ipv4 10.42.0.0/16 8
+@registry
+  ca ca.crt
+@registry2
+  ca ca2.crt

demo/confs/current/re6stnet_global.conf

+@ALL
+  log %/
+  run %/run
+  state %/
+  ca ca.crt
+  cert %/cert.crt
+  key %/cert.key
+  ovpnlog
+@m1
+  pp 1194 tcp
+  default
+  neighbour 6/16
+@m2
+  pp 1194 tcp
+  default
+@m3
+  pp 1194 tcp
+@m4
+  pp 1194 tcp
+  default
+@m5
+  default
+  client-count 0
+  max-clients 0
+@m6
+  ip fc42:6::1
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  # TODO: Run a DHCPv4 client on machine9. Unfortunately, isc-dhcp-client 4.2.4
+  #       fails with "Bind socket to interface: No such device"
+  daemon "exec dnsmasq -d8 - -i $re6stnet_iface -F 192.168.42.2,192.168.42.254,255.255.255.0,infinite -F ${re6stnet_subnet%/*},ra-only,${re6stnet_subnet#*/},1d -O option:router,192.168.42.1 -l m6/dnsmasq.leases"
+@m7
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+@m8
+  disable-proto none
+  client fc42:6::1,1195,udp6;fc42:7::1,1195,udp6
+@m10
+ -ca ca.crt
+  ca ca2.crt
+  default
+  client-count 2
+  max-clients 2
+@registry
+  dh dh2048.pem
+  gateway
+  disable-proto none
+@registry2
+  dh dh2048.pem
+ -ca ca.crt
+  ca ca2.crt
+  gateway

demo/confs/m1_china_reachable/clone.conf

+# Re6st
+

demo/confs/m1_china_reachable/re6st-registry_global.conf

+@ALL
+  key %/ca.key
+  logfile %/%.log
+  run %/run
+  dh dh2048.pem
+  hello 4
+  client-count 2
+  tunnel-refresh 100
+  ipv4 10.42.0.0/16 8
+@registry
+  ca ca.crt
+  same-country CN
+@registry2
+  ca ca2.crt

demo/confs/m1_china_reachable/re6stnet_global.conf

+@ALL
+  log %/
+  run %/run
+  state %/
+  ca ca.crt
+  cert %/cert.crt
+  key %/cert.key
+  ovpnlog
+  max-clients 0
+@m1
+  pp 1194 tcp
+  default
+  neighbour 3/16
+  country FR
+  -max-clients 0
+  max-clients 4
+  client-count 1
+@m2
+  pp 1194 tcp
+  default
+  country FR
+@m3
+  pp 1194 tcp
+  country CN
+@m4
+  pp 1194 tcp
+  default
+  country FR
+  -max-clients 0
+  max-clients 4
+@m5
+  default
+  client-count 0
+  country CN
+@m6
+  ip fc42:6::1
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  country FR
+  # TODO: Run a DHCPv4 client on machine9. Unfortunately, isc-dhcp-client 4.2.4
+  #       fails with "Bind socket to interface: No such device"
+  daemon "exec dnsmasq -d8 - -i $re6stnet_iface -F 192.168.42.2,192.168.42.254,255.255.255.0,infinite -F ${re6stnet_subnet%/*},ra-only,${re6stnet_subnet#*/},1d -O option:router,192.168.42.1 -l m6/dnsmasq.leases"
+@m7
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  country FR
+@m8
+  disable-proto none
+  client fc42:6::1,1195,udp6;fc42:7::1,1195,udp6
+  country FR
+@m10
+ -ca ca.crt
+  ca ca2.crt
+  default
+  client-count 2
+@registry
+  dh dh2048.pem
+  gateway
+  disable-proto none
+  country CN
+  -max-clients 0
+  max-clients 1
+@registry2
+  dh dh2048.pem
+ -ca ca.crt
+  ca ca2.crt
+  gateway

demo/confs/m1_china_unreachable/clone.conf

+# Re6st
+

demo/confs/m1_china_unreachable/re6st-registry_global.conf

+@ALL
+  key %/ca.key
+  logfile %/%.log
+  run %/run
+  dh dh2048.pem
+  hello 4
+  client-count 2
+  tunnel-refresh 100
+  ipv4 10.42.0.0/16 8
+@registry
+  ca ca.crt
+  same-country CN
+@registry2
+  ca ca2.crt

demo/confs/m1_china_unreachable/re6stnet_global.conf

+@ALL
+  log %/
+  run %/run
+  state %/
+  ca ca.crt
+  cert %/cert.crt
+  key %/cert.key
+  ovpnlog
+@m1
+  pp 1194 tcp
+  default
+  neighbour 6/16
+  country CN
+@m2
+  pp 1194 tcp
+  default
+  country FR
+@m3
+  pp 1194 tcp
+  country FR
+@m4
+  pp 1194 tcp
+  default
+  country FR
+@m5
+  default
+  client-count 0
+  max-clients 0
+  country FR
+@m6
+  ip fc42:6::1
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  country FR
+  # TODO: Run a DHCPv4 client on machine9. Unfortunately, isc-dhcp-client 4.2.4
+  #       fails with "Bind socket to interface: No such device"
+  daemon "exec dnsmasq -d8 - -i $re6stnet_iface -F 192.168.42.2,192.168.42.254,255.255.255.0,infinite -F ${re6stnet_subnet%/*},ra-only,${re6stnet_subnet#*/},1d -O option:router,192.168.42.1 -l m6/dnsmasq.leases"
+@m7
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  country FR
+@m8
+  disable-proto none
+  client fc42:6::1,1195,udp6;fc42:7::1,1195,udp6
+  country FR
+@m10
+ -ca ca.crt
+  ca ca2.crt
+  default
+  client-count 2
+  max-clients 2
+@registry
+  dh dh2048.pem
+  gateway
+  disable-proto none
+  country FR
+@registry2
+  dh dh2048.pem
+ -ca ca.crt
+  ca ca2.crt
+  gateway

demo/confs/old_conf/clone.conf

+# Re6st
+
+# | Commit    | Commit |     Date       | babeld   | babeld      | OpenVPN |
+# |           | number |                | commit   | version     |         |
+# | --------- | ------ | -------------- | -------- | ----------- | ------- |
+# |  cc3b779  |  451   | 21/01/2016     | 284612ac | v1.6.2-nxd1 |         |
+# |  4fda2dc  |  501   | 03/07/2018     |          | v1.6.2-nxd1 | 2.3.18  |
+# |  111a5e4  |  513   | 17/10/2018     |          | v1.6.2-nxd1 | 2.3.18  |
+# |  4397261  |  551   | 13/01/2020     |          | hmac-nxd2   | 2.4.7   |
+
+#re6stnet m1 commit 4397261
+#re6stnet m2 commit 4397261
+#re6stnet m4 commit 4397261
+#re6stnet m5 commit 4397261
+#re6stnet m6 commit 4397261
+#re6stnet m7 commit 4397261
+#re6stnet m8 commit 4397261
+
+# Babeld
+
+#babeld m2 commit v1.6.2-nxd1
+#babeld m3 commit v1.6.2-nxd1
+#babeld m6 commit v1.6.2-nxd1
+
+# OpenVPN
+
+#openvpn m2 commit v2.3.18
+#openvpn m3 commit v2.3.18
+#openvpn m6 commit v2.3.18

demo/confs/old_conf/re6st-registry_global.conf

+@ALL
+  key %/ca.key
+  logfile %/%.log
+  run %/run
+  dh dh2048.pem
+  hello 4
+  client-count 2
+  tunnel-refresh 100
+  ipv4 10.42.0.0/16 8
+@registry
+  ca ca.crt
+@registry2
+  ca ca2.crt

demo/confs/old_conf/re6stnet_global.conf

+@ALL
+  log %/
+  run %/run
+  state %/
+  ca ca.crt
+  cert %/cert.crt
+  key %/cert.key
+  ovpnlog
+@m1
+  pp 1194 tcp
+  default
+  neighbour 6/16
+@m2
+  pp 1194 tcp
+  default
+@m3
+  pp 1194 tcp
+@m4
+  pp 1194 tcp
+  default
+@m5
+  default
+  client-count 0
+  max-clients 0
+@m6
+  ip fc42:6::1
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  # TODO: Run a DHCPv4 client on machine9. Unfortunately, isc-dhcp-client 4.2.4
+  #       fails with "Bind socket to interface: No such device"
+  daemon "exec dnsmasq -d8 - -i $re6stnet_iface -F 192.168.42.2,192.168.42.254,255.255.255.0,infinite -F ${re6stnet_subnet%/*},ra-only,${re6stnet_subnet#*/},1d -O option:router,192.168.42.1 -l m6/dnsmasq.leases"
+@m7
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+@m8
+  disable-proto none
+  client fc42:6::1,1195,udp6;fc42:7::1,1195,udp6
+@m10
+ -ca ca.crt
+  ca ca2.crt
+  default
+  client-count 2
+  max-clients 2
+@registry
+  dh dh2048.pem
+  gateway
+  disable-proto none
+@registry2
+  dh dh2048.pem
+ -ca ca.crt
+  ca ca2.crt
+  gateway

demo/confs/protocol_and_countries-1/clone.conf

+# Re6st
+
+# | Commit    | Commit |     Date       | babeld   | babeld      | OpenVPN |
+# |           | number |                | commit   | version     |         |
+# | --------- | ------ | -------------- | -------- | ----------- | ------- |
+# |  cc3b779  |  451   | 21/01/2016     | 284612ac | v1.6.2-nxd1 |         |
+# |  4fda2dc  |  501   | 03/07/2018     |          | v1.6.2-nxd1 | 2.3.18  |
+# |  111a5e4  |  513   | 17/10/2018     |          | v1.6.2-nxd1 | 2.3.18  |
+# |  4397261  |  551   | 13/01/2020     |          | hmac-nxd2   | 2.4.7   |
+
+re6stnet m1 commit 4397261
+re6stnet m2 commit 4397261
+re6stnet m4 commit 4397261
+re6stnet m5 commit 4397261
+re6stnet m6 commit 4397261
+re6stnet m7 commit 4397261
+re6stnet m8 commit 4397261
+
+# Babeld
+
+#babeld m2 commit v1.6.2-nxd1
+#babeld m3 commit v1.6.2-nxd1
+#babeld m6 commit v1.6.2-nxd1
+
+# OpenVPN
+
+#openvpn m2 commit v2.3.18
+#openvpn m3 commit v2.3.18
+#openvpn m6 commit v2.3.18

demo/confs/protocol_and_countries-1/re6st-registry_global.conf

+@ALL
+  key %/ca.key
+  logfile %/%.log
+  run %/run
+  dh dh2048.pem
+  hello 4
+  client-count 2
+  tunnel-refresh 100
+  ipv4 10.42.0.0/16 8
+@registry
+  ca ca.crt
+@registry2
+  ca ca2.crt

demo/confs/protocol_and_countries-1/re6stnet_global.conf

+@ALL
+  log %/
+  run %/run
+  state %/
+  ca ca.crt
+  cert %/cert.crt
+  key %/cert.key
+  ovpnlog
+@m1
+  pp 1194 tcp
+  default
+  neighbour 6/16
+@m2
+  pp 1194 tcp
+  default
+@m3
+  pp 1194 tcp
+  country FR
+@m4
+  ip 10.2.1.3
+  pp 1194 tcp
+  default
+  client-count 0
+  max-clients 2
+@m5
+  default
+  client-count 0
+  max-clients 0
+@m6
+  ip fc42:6::1
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  # TODO: Run a DHCPv4 client on machine9. Unfortunately, isc-dhcp-client 4.2.4
+  #       fails with "Bind socket to interface: No such device"
+  daemon "exec dnsmasq -d8 - -i $re6stnet_iface -F 192.168.42.2,192.168.42.254,255.255.255.0,infinite -F ${re6stnet_subnet%/*},ra-only,${re6stnet_subnet#*/},1d -O option:router,192.168.42.1 -l m6/dnsmasq.leases"
+@m7
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+@m8
+  disable-proto none
+  client fc42:6::1,1195,udp6;fc42:7::1,1195,udp6
+@m10
+ -ca ca.crt
+  ca ca2.crt
+  default
+  client-count 2
+  max-clients 2
+@registry
+  dh dh2048.pem
+  gateway
+  disable-proto none
+  country FR
+@registry2
+  dh dh2048.pem
+ -ca ca.crt
+  ca ca2.crt
+  gateway

demo/confs/protocol_and_countries-2/clone.conf

+# Re6st
+
+# | Commit    | Commit |     Date       | babeld   | babeld      | OpenVPN |
+# |           | number |                | commit   | version     |         |
+# | --------- | ------ | -------------- | -------- | ----------- | ------- |
+# |  cc3b779  |  451   | 21/01/2016     | 284612ac | v1.6.2-nxd1 |         |
+# |  4fda2dc  |  501   | 03/07/2018     |          | v1.6.2-nxd1 | 2.3.18  |
+# |  111a5e4  |  513   | 17/10/2018     |          | v1.6.2-nxd1 | 2.3.18  |
+# |  4397261  |  551   | 13/01/2020     |          | hmac-nxd2   | 2.4.7   |
+
+#re6stnet m1 commit 4397261
+#re6stnet m2 commit 4397261
+re6stnet m4 commit 4397261
+#re6stnet m5 commit 4397261
+#re6stnet m6 commit 4397261
+#re6stnet m7 commit 4397261
+#re6stnet m8 commit 4397261
+
+# Babeld
+
+#babeld m2 commit v1.6.2-nxd1
+#babeld m3 commit v1.6.2-nxd1
+#babeld m6 commit v1.6.2-nxd1
+
+# OpenVPN
+
+#openvpn m2 commit v2.3.18
+#openvpn m3 commit v2.3.18
+#openvpn m6 commit v2.3.18

demo/confs/protocol_and_countries-2/re6st-registry_global.conf

+@ALL
+  key %/ca.key
+  logfile %/%.log
+  run %/run
+  dh dh2048.pem
+  hello 4
+  client-count 2
+  tunnel-refresh 100
+  ipv4 10.42.0.0/16 8
+@registry
+  ca ca.crt
+@registry2
+  ca ca2.crt

demo/confs/protocol_and_countries-2/re6stnet_global.conf

+@ALL
+  log %/
+  run %/run
+  state %/
+  ca ca.crt
+  cert %/cert.crt
+  key %/cert.key
+  ovpnlog
+@m1
+  pp 1194 tcp
+  default
+  neighbour 6/16
+  country FR
+@m2
+  pp 1194 tcp
+  default
+  country FR
+@m3
+  pp 1194 tcp
+  country FR
+@m4
+  ip 10.2.1.3
+  pp 1194 tcp
+  default
+@m5
+  default
+  client-count 0
+  max-clients 0
+  country FR
+@m6
+  ip fc42:6::1
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  # TODO: Run a DHCPv4 client on machine9. Unfortunately, isc-dhcp-client 4.2.4
+  #       fails with "Bind socket to interface: No such device"
+  daemon "exec dnsmasq -d8 - -i $re6stnet_iface -F 192.168.42.2,192.168.42.254,255.255.255.0,infinite -F ${re6stnet_subnet%/*},ra-only,${re6stnet_subnet#*/},1d -O option:router,192.168.42.1 -l m6/dnsmasq.leases"
+  country FR
+@m7
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  country FR
+@m8
+  disable-proto none
+  client fc42:6::1,1195,udp6;fc42:7::1,1195,udp6
+  country FR
+@m10
+ -ca ca.crt
+  ca ca2.crt
+  default
+  client-count 2
+  max-clients 2
+@registry
+  dh dh2048.pem
+  gateway
+  disable-proto none
+  country FR
+@registry2
+  dh dh2048.pem
+ -ca ca.crt
+  ca ca2.crt
+  gateway

demo/confs/two_networks/clone.conf

+# Re6st
+
+re6stnet m2 commit 4397261
+re6stnet m3 commit 4397261
+re6stnet m4 commit 4397261
+re6stnet m6 commit 4397261
+re6stnet m7 commit 4397261
+re6stnet m8 commit 4397261
+re6stnet m9 commit 4397261
+re6stnet m10 commit 4397261

demo/confs/two_networks/re6st-registry_global.conf

+@ALL
+  key %/ca.key
+  logfile %/%.log
+  run %/run
+  dh dh2048.pem
+  hello 4
+  client-count 2
+  tunnel-refresh 100
+  ipv4 10.42.0.0/16 8
+@registry
+  ca ca.crt
+  same-country CN
+@registry2
+  ca ca2.crt

demo/confs/two_networks/re6stnet_global.conf

+@ALL
+  log %/
+  run %/run
+  state %/
+  ca ca.crt
+  cert %/cert.crt
+  key %/cert.key
+  ovpnlog
+@m1
+  pp 1194 tcp
+  default
+  neighbour 6/16
+  country FR
+@m2
+  pp 1194 tcp
+  default
+  country FR
+@m3
+  pp 1194 tcp
+  country CN
+@m4
+  pp 1194 tcp
+  default
+  country CN
+@m5
+  default
+  client-count 0
+  max-clients 0
+  country CN
+@m6
+  ip fc42:6::1
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  country FR
+  # TODO: Run a DHCPv4 client on machine9. Unfortunately, isc-dhcp-client 4.2.4
+  #       fails with "Bind socket to interface: No such device"
+  daemon "exec dnsmasq -d8 - -i $re6stnet_iface -F 192.168.42.2,192.168.42.254,255.255.255.0,infinite -F ${re6stnet_subnet%/*},ra-only,${re6stnet_subnet#*/},1d -O option:router,192.168.42.1 -l m6/dnsmasq.leases"
+@m7
+  pp 1194 tcp
+  pp 1194 udp
+  pp 1195 udp6
+  disable-proto none
+  country FR
+@m8
+  disable-proto none
+  client fc42:6::1,1195,udp6;fc42:7::1,1195,udp6
+  country FR
+@m10
+ -ca ca.crt
+  ca ca2.crt
+  default
+  client-count 2
+  max-clients 2
+@registry
+  dh dh2048.pem
+  gateway
+  disable-proto none
+  country FR
+@registry2
+  dh dh2048.pem
+ -ca ca.crt
+  ca ca2.crt
+  gateway

demo/demo

@@ -14,7 +14,7 @@ REGISTRY_SERIAL = '0x120010db80042'
 REGISTRY2_SERIAL = '0x120010db80043'
 CA_DAYS = 1000
 # global variables for the --clone option
-REPOSITORY_URL = {'re6stnet': 'https://lab.nexedi.com/jhuge/re6stnet.git',
+REPOSITORY_URL = {'re6stnet': 'https://lab.nexedi.com/nexedi/re6stnet.git',
                   'babeld': 'https://lab.nexedi.com/nexedi/babeld.git',
                   'openvpn': 'https://github.com/OpenVPN/openvpn.git'}
 BINARY_PATH = {'babeld': 'babeld',

demo/re6st-registry_global.conf

@@ -9,5 +9,6 @@
   ipv4 10.42.0.0/16 8
 @registry
   ca ca.crt
+  same-country CN
 @registry2
   ca ca2.crt

demo/re6stnet_global.conf

@@ -16,6 +16,7 @@
 @m3
   pp 1194 tcp
 @m4
+  ip 10.2.1.3
   pp 1194 tcp
   default
 @m5