sprinterfreak/site-ffrgb-dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjusted v6 prefix generation

Browse Source
This commit is contained in:
Bastian 2018-01-10 17:23:02 +01:00
parent 0540f47b78
commit b820be2306
2 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
extra/groups.conf
View File

@ -3,16 +3,64 @@
subst = { subst = {
['%%ID'] = '01', ['%%ID'] = '01',
['%%V4'] = '10.90.32.0/19', ['%%V4'] = '10.90.32.0/19',
['%%V6'] = '100', ['%%V6'] = '20',
['%%N4'] = '10.90.32.1', ['%%N4'] = '10.90.32.1',
['%%MT'] = '1426',
['%%BS'] = '02:0E:8E:1E:61:01',
['%%NN'] = '16:41:95:40:f7:01',
['%%IB'] = 'mesh.ffrgb_cty',
['%%PRI'] = '185.53.218.131',
['%%SEC'] = '',
['%%PRIKEY'] = '',
['%%SECKEY'] = '',
}, },
}, },
ffrgb_uml = { ffrgb_uml = {
subst = { subst = {
['%%ID'] = '02', ['%%ID'] = '02',
['%%V4'] = '10.90.64.0/19', ['%%V4'] = '10.90.64.0/19',
['%%V6'] = '200', ['%%V6'] = '20',
['%%N4'] = '10.90.64.1', ['%%N4'] = '10.90.64.1',
['%%MT'] = '1426',
['%%BS'] = '02:0E:8E:1E:61:02',
['%%NN'] = '16:41:95:40:f7:02',
['%%IB'] = 'mesh.ffrgb_uml',
['%%PRI'] = '185.53.218.132',
['%%SEC'] = '',
['%%PRIKEY'] = '',
['%%SECKEY'] = '',
}, },
}, },
ffrgb_uml = {
subst = {
['%%ID'] = '03',
['%%V4'] = '10.90.96.0/19',
['%%V6'] = '30',
['%%N4'] = '10.90.96.1',
['%%MT'] = '1426',
['%%BS'] = '02:0E:8E:1E:61:02',
['%%NN'] = '16:41:95:40:f7:02',
['%%IB'] = 'mesh.ffrgb_test',
['%%PRI'] = '185.53.218.132',
['%%SEC'] = '',
['%%PRIKEY'] = '',
['%%SECKEY'] = '',
},
},
legacy = {
subst = {
['%%ID'] = '00',
['%%V4'] = '10.90.0.0/19',
['%%V6'] = '00',
['%%N4'] = '10.90.0.1',
['%%MT'] = '1426',
['%%BS'] = '02:0E:8E:1E:61:17',
['%%NN'] = '16:41:95:40:f7:dd',
['%%IB'] = 'mesh.ffrgb',
['%%PRI'] = '78.47.168.10',
['%%SEC'] = '213.166.225.5',
['%%PRIKEY'] = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
['%%SECKEY'] = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
},
},
} }

6
extra/template.conf
View File

@ -1,6 +1,6 @@
{ {
hostname_prefix = '', hostname_prefix = '',
site_name = 'Freifunk Regensburg', site_name = '%SN',
site_code = '%SC', site_code = '%SC',
opkg = { opkg = {
@ -8,7 +8,7 @@
}, },
prefix4 = '%V4', prefix4 = '%V4',
prefix6 = '%V6', prefix6 = 'fdef:f%V6f:1337:cafe::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'}, ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
@ -43,7 +43,7 @@
next_node = { next_node = {
ip4 = '%N4', ip4 = '%N4',
ip6 = 'fdef:f00f:1337:%ID::1', ip6 = 'fdef:f%V6f:1337:cafe::1',
mac = '%NN', mac = '%NN',
}, },