From 291947a156f90200a18e2c6b806381d395b2157b Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 14 Jan 2018 20:44:00 +0100 Subject: [PATCH] fixed default config --- extra/default.conf | 27 +++++++++++++-------------- extra/template.conf | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/extra/default.conf b/extra/default.conf index d5a6d51..9bf7293 100644 --- a/extra/default.conf +++ b/extra/default.conf @@ -1,18 +1,17 @@ subst = { ['%%SN'] = 'Bitte wählen', ['%%SC'] = 'ffrgb', - ['%%GN'] = 'legacy', - ['%%ID'] = '00', - ['%%SS'] = 'regensburg.freifunk.net', - ['%%V4'] = '10.90.0.0/19', - ['%%V6'] = 'fdef:f00f:1337:cafe::/64', - ['%%N4'] = '10.90.0.1', - ['%%BS'] = '02:0E:8E:1E:61:17', - ['%%NN'] = '16:41:95:40:f7:dd', - ['%%IB'] = 'mesh.ffrgb', - ['%%MT'] = '1426', - ['%%PRI'] = '78.47.168.10', - ['%%SEC'] = '213.166.225.5', - ['%%PRIKEY'] = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66' - ['%%SECKEY'] = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5' + ['%%GN'] = 'ffrgb_cty', + ['%%ID'] = '01', + ['%%V4'] = '10.90.32.0/19', + ['%%V6'] = '10', + ['%%N4'] = '10.90.32.1', + ['%%MT'] = '1280', + ['%%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'] = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd', + ['%%SECKEY'] = '', } diff --git a/extra/template.conf b/extra/template.conf index 668bfc7..4962e7a 100644 --- a/extra/template.conf +++ b/extra/template.conf @@ -54,7 +54,7 @@ ingress = 12000, egress = 1200, }, - methods = {'salsa2012+umac'}, + methods = {'salsa2012+umac','null'}, mtu = '%MT', groups = { backbone = {