diff --git a/domains/flu.conf b/domains/flu.conf new file mode 100644 index 0000000..aa593f8 --- /dev/null +++ b/domains/flu.conf @@ -0,0 +1,58 @@ +{ + domain_names = { + tdf = 'Troisdorf Umland', + inn = 'Innenstadt', + flu = 'Soziale Netze', + }, + domain_seed = '6e54bb395470ed41f6e3866d1c856714847d3eb37282251a0b4121b153e3ccc4', + + prefix4 = '10.188.64.0/19', + prefix6 = 'fda0:747e:ab29:7405::/64', + + next_node = { + ip4 = '10.188.64.1', + ip6 = 'fda0:747e:ab29:7405::1', + mac = '04:74:05:d0:4f:aa', + }, + wifi24 = { + channel = 5, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-flu-mesh', + }, + }, + wifi5 = { + channel = 44, + outdoor_chanlist = '100-140', + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-flu-mesh', + }, + }, + mesh = { + vxlan = false, + batman_adv = { + gw_sel_class = 3, + routing_algo = 'BATMAN_IV', + }, + }, + mesh_vpn = { + mtu = 1312, + tunneldigger = { + brokers = { + 'flu1.freifunk-troisdorf.de:53842', + 'flu2.freifunk-troisdorf.de:53840' + }, + bandwidth_limit = { + enabled = false, + egress = 2000, + ingress = 6000, + }, + }, + }, + +} \ No newline at end of file diff --git a/domains/inn.conf b/domains/inn.conf new file mode 100644 index 0000000..e9d2ca4 --- /dev/null +++ b/domains/inn.conf @@ -0,0 +1,58 @@ +{ + domain_names = { + tdf = 'Troisdorf Umland', + inn = 'Innenstadt', + flu = 'Soziale Netze', + }, + domain_seed = '884f7f15965ec522dfd4c74195798eabf5bd3734406d80d7c5af7521d441fb4a', + + prefix4 = '10.188.32.0/19', + prefix6 = 'fda0:747e:ab29:7405::/64', + + next_node = { + ip4 = '10.188.32.1', + ip6 = 'fda0:747e:ab29:7405::1', + mac = '04:74:05:d0:4f:aa', + }, + wifi24 = { + channel = 5, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-inn-mesh', + }, + }, + wifi5 = { + channel = 44, + outdoor_chanlist = '100-140', + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-inn-mesh', + }, + }, + mesh = { + vxlan = false, + batman_adv = { + gw_sel_class = 3, + routing_algo = 'BATMAN_IV', + }, + }, + mesh_vpn = { + mtu = 1312, + tunneldigger = { + brokers = { + 'inn1.freifunk-troisdorf.de:53842', + 'inn2.freifunk-troisdorf.de:53840' + }, + bandwidth_limit = { + enabled = false, + egress = 2000, + ingress = 6000, + }, + }, + }, + +} \ No newline at end of file diff --git a/domains/tdf.conf b/domains/tdf.conf new file mode 100644 index 0000000..01e3afe --- /dev/null +++ b/domains/tdf.conf @@ -0,0 +1,58 @@ +{ + domain_names = { + tdf = 'Troisdorf Umland', + inn = 'Innenstadt', + flu = 'Soziale Netze', + }, + domain_seed = '9a38c49fc5069254c7588a551e6b781691600055fce54777c31e051c3ff84352', + + prefix4 = '10.188.0.0/19', + prefix6 = 'fda0:747e:ab29:7405::/64', + + next_node = { + ip4 = '10.188.0.1', + ip6 = 'fda0:747e:ab29:7405::1', + mac = '04:74:05:d0:4f:aa', + }, + wifi24 = { + channel = 5, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-tdf-mesh', + }, + }, + wifi5 = { + channel = 44, + outdoor_chanlist = '100-140', + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-tdf-mesh', + }, + }, + mesh = { + vxlan = false, + batman_adv = { + gw_sel_class = 3, + routing_algo = 'BATMAN_IV', + }, + }, + mesh_vpn = { + mtu = 1312, + tunneldigger = { + brokers = { + 'tdf1.freifunk-troisdorf.de:53842', + 'tdf2.freifunk-troisdorf.de:53840' + }, + bandwidth_limit = { + enabled = false, + egress = 2000, + ingress = 6000, + }, + }, + }, + +} \ No newline at end of file diff --git a/i18n/de.po b/i18n/de.po index 4c0773d..28f566b 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -19,10 +19,19 @@ msgstr "" "für Experten zu bearbeiten, da dies später nicht mehr möglich ist." "Bitte beachte, dass die unter Kontakt eingetragene E-Mail Adresse später öffentlich sichtbar ist!" +msgid "gluon-config-mode:domain" +msgstr "Domäne" + msgid "gluon-config-mode:pubkey" msgstr "" "Die Konfiguration ist nun abgeschlossen. Das Registrieren des Nodes ist nicht mehr erforderlich. " +msgid "gluon-config-mode:domain-select" +msgstr "" +"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten " +"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den " +"Knoten der ausgewählten Domäne verbinden kann." + msgid "gluon-config-mode:reboot" msgstr "" "

Der Knoten (Router) startet gerade neu und wird anschließend versuchen, " diff --git a/i18n/en.po b/i18n/en.po index af76c0d..33c58c8 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -18,6 +18,15 @@ msgstr "" "Please note, that the email address in the contact field will be" "publicly visible." +msgid "gluon-config-mode:domain" +msgstr "Domain" + +msgid "gluon-config-mode:domain-select" +msgstr "" +"Here you have the possibility of selecting the mesh domain in which your node " +"is placed. Please keep in mind that your router only connects with the nodes " +"of the selected domain." + msgid "gluon-config-mode:pubkey" msgstr "" "This is your Freifunk node's public key. The registration of the node " diff --git a/site.conf b/site.conf index 520b433..7b9e43d 100644 --- a/site.conf +++ b/site.conf @@ -2,9 +2,8 @@ hostname_prefix = 'tdf', site_name = 'Freifunk Troisdorf', site_code = 'tdf', - domain_seed = '9a38c49fc5069254c7588a551e6b781691600055fce54777c31e051c3ff84352', - prefix4 = '10.188.0.0/19', - prefix6 = 'fda0:747e:ab29:7405::/64', + default_domain = 'tdf', + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin ntp_servers = { 'ntp1.infra.fftdf', @@ -13,37 +12,6 @@ '1.de.pool.ntp.org', }, regdom = 'DE', - wifi24 = { - channel = 5, - ap = { - ssid = 'Freifunk', - }, - mesh = { - id = 'troisdorf-tdf-mesh', - }, - }, - wifi5 = { - channel = 44, - outdoor_chanlist = '100-140', - ap = { - ssid = 'Freifunk', - }, - mesh = { - id = 'troisdorf-tdf-mesh', - }, - }, - next_node = { - ip4 = '10.188.0.1', - ip6 = 'fda0:747e:ab29:7405::1', - mac = '04:74:05:d0:4f:aa', - }, - mesh = { - vxlan = false, - batman_adv = { - gw_sel_class = 3, - routing_algo = 'BATMAN_IV', - }, - }, autoupdater = { enabled = true, branch = 'stable', @@ -51,9 +19,9 @@ stable = { name = 'stable', mirrors = { - 'http://update1.infra.fftdf/tdf/stable/sysupgrade', - 'http://update2.infra.fftdf/tdf/stable/sysupgrade', - 'http://images.freifunk-troisdorf.de/tdf/stable/sysupgrade' + 'http://update1.infra.fftdf/multi/stable/sysupgrade', + 'http://update2.infra.fftdf/multi/stable/sysupgrade', + 'http://images.freifunk-troisdorf.de/multi/stable/sysupgrade' }, good_signatures = 2, pubkeys = { @@ -72,9 +40,9 @@ beta = { name = 'beta', mirrors = { - 'http://update1.infra.fftdf/tdf/beta/sysupgrade', - 'http://update2.infra.fftdf/tdf/beta/sysupgrade', - 'http://images.freifunk-troisdorf.de/tdf/beta/sysupgrade' + 'http://update1.infra.fftdf/multi/beta/sysupgrade', + 'http://update2.infra.fftdf/multi/beta/sysupgrade', + 'http://images.freifunk-troisdorf.de/multi/beta/sysupgrade' }, good_signatures = 2, pubkeys = { @@ -92,9 +60,9 @@ experimental = { name = 'experimental', mirrors = { - 'http://update1.infra.fftdf/tdf/experimental/sysupgrade', - 'http://update2.infra.fftdf/tdf/experimental/sysupgrade', - 'http://images.freifunk-troisdorf.de/tdf/experimental/sysupgrade' + 'http://update1.infra.fftdf/multi/experimental/sysupgrade', + 'http://update2.infra.fftdf/multi/experimental/sysupgrade', + 'http://images.freifunk-troisdorf.de/multi/experimental/sysupgrade' }, good_signatures = 2, pubkeys = { @@ -111,20 +79,7 @@ }, }, }, - mesh_vpn = { - mtu = 1312, - tunneldigger = { - brokers = { - 'tdf1.freifunk-troisdorf.de:53842', - 'tdf2.freifunk-troisdorf.de:53840' - }, - bandwidth_limit = { - enabled = false, - egress = 2000, - ingress = 6000, - }, - }, - }, + roles = { default = 'node', list = { diff --git a/site.mk b/site.mk index 0af2fcd..4a21a21 100644 --- a/site.mk +++ b/site.mk @@ -8,6 +8,7 @@ GLUON_FEATURES := \ config-mode-geo-location \ config-mode-contact-info \ config-mode-mesh-vpn \ + config-mode-domain-select \ mesh-vpn-tunneldigger \ ebtables-filter-multicast \ ebtables-filter-ra-dhcp \ @@ -34,6 +35,7 @@ GLUON_SITE_PACKAGES := \ gluon-ping-check \ gluon-rsk-speedlimit \ +GLUON_MULTIDOMAIN=1 DEFAULT_GLUON_RELEASE := 2014.4-stable-2.1 # Allow overriding the release number from the command line