forked from remote/site-ffmuc
Merged changes for testing purposes
from https://muc.pads.ccc.de/freifunk-siteconfig
This commit is contained in:
midzer
85
site.conf
85
site.conf
@@ -25,8 +25,8 @@
|
||||
prefix6: IPv6 range of your community
|
||||
is also required for radvd
|
||||
]]
|
||||
prefix4 = '10.180.0.0/20',
|
||||
prefix6 = 'fdef:ffc0:3dd7::/64',
|
||||
prefix4 = '10.80.0.0/20',
|
||||
prefix6 = 'fdef:ffc0:4fff::/64',
|
||||
|
||||
|
||||
--[[ NTP settings
|
||||
@@ -37,7 +37,7 @@
|
||||
http://www.pool.ntp.org/zone/de
|
||||
]]
|
||||
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
|
||||
ntp_servers = {'1.ntp.services.ffhl'},
|
||||
ntp_servers = {'1.ntp.services.ffm'},
|
||||
|
||||
|
||||
--[[ Wireless settings
|
||||
@@ -89,8 +89,8 @@
|
||||
(TODO: What is the purpose of this MAC-Address here?)
|
||||
]]
|
||||
next_node = {
|
||||
ip4 = '10.130.0.1',
|
||||
ip6 = 'fdef:ffc0:3dd7::1',
|
||||
ip4 = '10.80.0.1',
|
||||
ip6 = 'fdef:ffc0:4fff::1',
|
||||
mac = '16:41:95:40:f7:dc',
|
||||
},
|
||||
|
||||
@@ -119,70 +119,9 @@
|
||||
backbone = {
|
||||
limit = 2,
|
||||
peers = {
|
||||
burgtor = {
|
||||
key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03',
|
||||
remotes = {'ipv4 "burgtor.mesh.ffhl.chaotikum.org" port 10000'},
|
||||
},
|
||||
holstentor = {
|
||||
key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067',
|
||||
remotes = {'ipv4 "holstentor.mesh.ffhl.chaotikum.org" port 10000'},
|
||||
},
|
||||
huextertor = {
|
||||
key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238',
|
||||
remotes = {'ipv4 "huextertor.mesh.ffhl.chaotikum.org" port 10000'},
|
||||
},
|
||||
muehlentor = {
|
||||
key = 'bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a',
|
||||
remotes = {'ipv4 "muehlentor.mesh.ffhl.chaotikum.org" port 10000'},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
--[[ Autoupdater settings
|
||||
branch: Automatically update to this branch
|
||||
branches: Available branches your community is publishing
|
||||
sub sub
|
||||
name: Name of branch (is used when compiling images)
|
||||
mirrors: List of urls where to find the firmware
|
||||
just serve the images on port 80 via http. a simple apache file-listing is enough.
|
||||
see: http://luebeck.freifunk.net/firmware/
|
||||
probability: How often should a node search for updates
|
||||
1.0 - perform an update every hour
|
||||
0.5 - on average, perform an update every two hours
|
||||
0.0 - inhibit any automatic updates
|
||||
good_signatures: How many signatures should be valid so the node decides to upgrade itself
|
||||
pubkeys: public keys by developers used in manifest file of branch
|
||||
manifest file - see gluon readme
|
||||
$ make manifest GLUON_BRANCH=mybranch
|
||||
$ contrib/sign.sh $SECRETKEY.file images/sysupgrade/manifest
|
||||
]]
|
||||
autoupdater = {
|
||||
branch = 'experimental',
|
||||
branches = {
|
||||
stable = {
|
||||
name = 'stable',
|
||||
mirrors = {'http://1.updates.services.ffhl/stable/sysupgrade'},
|
||||
probability = 0.08,
|
||||
good_signatures = 2,
|
||||
pubkeys = {
|
||||
'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', -- Linus
|
||||
'a8dd60765b07330a4bbfdf8406102befca132881a4b65f3efda32cf2d5b362d9', -- Nils
|
||||
'323bd3285c4e5547a89cd6da1f2aef67f1654b0928bbd5b104efc9dab2156d0b', -- NeoRaider
|
||||
},
|
||||
},
|
||||
experimental = {
|
||||
-- DE: Name des "braches" wird beim erstellen von Images / update generiert
|
||||
name = 'experimental',
|
||||
mirrors = {'http://1.updates.services.ffhl/experimental/sysupgrade'},
|
||||
probability = 1.00,
|
||||
good_signatures = 2,
|
||||
good_signatures = 1,
|
||||
-- DE: Oeffentlicher Schluessel / Public Key der Entwickler
|
||||
pubkeys = {
|
||||
'496136b37e5f561dfdf523611f14e4b6bc2a745cbc1ab7daffa59fded5f202d1', -- philae
|
||||
},
|
||||
test = {
|
||||
key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101',
|
||||
remotes = {'ipv4 "46.149.18.17" port 1234'},
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -224,24 +163,24 @@
|
||||
]]
|
||||
config_mode = {
|
||||
msg_welcome = [[
|
||||
Willkommen zum Einrichtungsassistenten für deinen neuen Lübecker
|
||||
Willkommen zum Einrichtungsassistenten für deinen neuen Münchner
|
||||
Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen
|
||||
entsprechend aus und sende es ab.
|
||||
]],
|
||||
msg_pubkey = [[
|
||||
Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem
|
||||
er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde,
|
||||
kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte
|
||||
kann sich dein Knoten mit dem Münchner Mesh-VPN zu verbinden. Bitte
|
||||
schicke dazu diesen Schlüssel und den Namen deines Knotens
|
||||
(<em><%=hostname%></em>) an
|
||||
<a href="mailto:keys@luebeck.freifunk.net">keys@luebeck.freifunk.net</a>.
|
||||
<a href="mailto:keys@muenchen.freifunk.net">keys@muenchen.freifunk.net</a>.
|
||||
]],
|
||||
msg_reboot = [[
|
||||
<p>
|
||||
Dein Knoten startet gerade neu und wird anschließend versuchen,
|
||||
sich anschließend mit anderen Freifunk-Knoten in seiner Nähe zu
|
||||
verbinden. Weitere Informationen zur
|
||||
Münchener Freifunk-Community findest du auf
|
||||
Münchner Freifunk-Community findest du auf
|
||||
<a href="https://muenchen.freifunk.net/">unserer Webseite</a>.
|
||||
</p>
|
||||
<p>
|
||||
|
||||
Reference in New Issue
Block a user