From d31593b2d9d1544f5d6274c782d947d0a006e6c1 Mon Sep 17 00:00:00 2001 From: 4ndr3 Date: Sat, 13 Feb 2016 12:03:12 +0100 Subject: [PATCH] =?UTF-8?q?vid=20&=20MTU=20tags=20entfernt.=20snmp=20teilw?= =?UTF-8?q?eise=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Richtfunk/bb-artfiles-kern/etc/config/network | 63 +++++++------ .../bb-doormann22-kern/etc/config/network | 22 ----- .../bb-esmarch95-kern/etc/config/network | 35 ++++---- Richtfunk/bb-flora-kern/etc/config/network | 3 - Richtfunk/bb-flora-kern/etc/config/snmpd | 43 +++++++++ Richtfunk/bb-fux-kern/etc/config/network | 76 +++++++--------- Richtfunk/bb-fux-kern/etc/config/snmpd | 8 +- .../bb-stpaulikirche-kern/etc/config/network | 89 +++++++++---------- Richtfunk/bb-werkhof-kern/etc/config/network | 85 ++++++++++-------- 9 files changed, 211 insertions(+), 213 deletions(-) create mode 100644 Richtfunk/bb-flora-kern/etc/config/snmpd diff --git a/Richtfunk/bb-artfiles-kern/etc/config/network b/Richtfunk/bb-artfiles-kern/etc/config/network index 96bcb4b..e390c26 100644 --- a/Richtfunk/bb-artfiles-kern/etc/config/network +++ b/Richtfunk/bb-artfiles-kern/etc/config/network @@ -30,29 +30,26 @@ config switch_vlan option ports '0t 1' config switch_vlan - option device 'switch0' - option vlan '5' - option ports '0t 5t' - option vid '5' + option device 'switch0' + option vlan '5' + option ports '0t 5t' config switch_vlan - option device 'switch0' - option vlan '26' - option ports '0t 5t' - option vid '26' + option device 'switch0' + option vlan '26' + option ports '0t 5t' config interface 'vlan5' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.34' - option netmask '255.255.255.0' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.34' + option netmask '255.255.255.0' -config interface 'vlan26' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.26' - option macaddr 'de:ad:be:ef:90:70' +config interface 'vlan26' + option proto 'batadv' + option mesh 'bat0' + option ifname 'eth0.26' + option macaddr 'de:ad:be:ef:90:70' config interface 'wan' option igmp_snooping '0' @@ -84,21 +81,6 @@ config interface 'client' option macaddr 'e8:94:f6:cd:6d:46' option peerdns '1' -config interface 'bat0' - option ifname 'bat0' - option macaddr 'e8:94:f6:cd:6d:46' - option proto 'none' - -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - config interface 'mesh_wan' option ifname 'br-wan' option mesh 'bat0' @@ -119,6 +101,21 @@ config interface 'mesh_vpn' option mesh 'bat0' option proto 'batadv' +config interface 'bat0' + option ifname 'bat0' + option macaddr 'e8:94:f6:cd:6d:46' + option proto 'none' + +config interface 'mesh_radio0' + option mesh 'bat0' + option proto 'batadv' + option mtu '1528' + +config interface 'mesh_radio1' + option mesh 'bat0' + option proto 'batadv' + option mtu '1528' + config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' diff --git a/Richtfunk/bb-doormann22-kern/etc/config/network b/Richtfunk/bb-doormann22-kern/etc/config/network index 2798513..4878d6a 100644 --- a/Richtfunk/bb-doormann22-kern/etc/config/network +++ b/Richtfunk/bb-doormann22-kern/etc/config/network @@ -32,37 +32,26 @@ config switch_vlan config switch_vlan option vlan '5' option ports '0t 2t' - option vid '5' - option device 'switch0' - -config switch_vlan - option vlan '10' - option ports '0t 2t' - option vid '10' option device 'switch0' config switch_vlan option vlan '23' option ports '0t 2t' - option vid '23' option device 'switch0' config switch_vlan option vlan '24' option ports '0t 2t' - option vid '24' option device 'switch0' config switch_vlan option vlan '25' option ports '0t 2t' - option vid '25' option device 'switch0' config switch_vlan option vlan '28' option ports '0t 2t' - option vid '28' option device 'switch0' config interface 'vlan5' @@ -71,38 +60,27 @@ config interface 'vlan5' option ipaddr '192.168.112.23' option netmask '255.255.255.0' -config interface 'vlan10' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.10' - option macaddr 'de:ad:be:ef:90:40' - config interface 'vlan23' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.23' option macaddr 'de:ad:be:ef:90:41' config interface 'vlan24' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.24' option macaddr 'de:ad:be:ef:90:42' config interface 'vlan25' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.25' option macaddr 'de:ad:be:ef:90:43' config interface 'vlan28' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.28' option macaddr 'de:ad:be:ef:90:44' diff --git a/Richtfunk/bb-esmarch95-kern/etc/config/network b/Richtfunk/bb-esmarch95-kern/etc/config/network index a4e7655..5b0fd88 100644 --- a/Richtfunk/bb-esmarch95-kern/etc/config/network +++ b/Richtfunk/bb-esmarch95-kern/etc/config/network @@ -32,19 +32,16 @@ config switch_vlan config switch_vlan option vlan '5' option ports '0t 2t' - option vid '5' option device 'switch0' config switch_vlan option vlan '10' option ports '0t 2t' - option vid '10' option device 'switch0' config switch_vlan option vlan '20' option ports '0t 2t' - option vid '20' option device 'switch0' config interface 'vlan5' @@ -56,14 +53,12 @@ config interface 'vlan5' config interface 'vlan10' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.10' option macaddr 'de:ad:be:ef:90:00' config interface 'vlan20' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.20' option macaddr 'de:ad:be:ef:90:01' @@ -97,21 +92,6 @@ config interface 'client' option macaddr 'f8:1a:67:5a:5d:e8' option peerdns '1' -config interface 'bat0' - option ifname 'bat0' - option macaddr 'f8:1a:67:5a:5d:e8' - option proto 'none' - -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - config interface 'mesh_wan' option auto '0' option ifname 'br-wan' @@ -132,6 +112,21 @@ config interface 'mesh_vpn' option mesh 'bat0' option proto 'batadv' +config interface 'bat0' + option ifname 'bat0' + option macaddr 'f8:1a:67:5a:5d:e8' + option proto 'none' + +config interface 'mesh_radio0' + option mesh 'bat0' + option proto 'batadv' + option mtu '1528' + +config interface 'mesh_radio1' + option mesh 'bat0' + option proto 'batadv' + option mtu '1528' + config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' diff --git a/Richtfunk/bb-flora-kern/etc/config/network b/Richtfunk/bb-flora-kern/etc/config/network index 06d2439..0b8c56b 100644 --- a/Richtfunk/bb-flora-kern/etc/config/network +++ b/Richtfunk/bb-flora-kern/etc/config/network @@ -32,13 +32,11 @@ config switch_vlan config switch_vlan option vlan '5' option ports '0t 2t' - option vid '5' option device 'switch0' config switch_vlan option vlan '24' option ports '0t 2t' - option vid '24' option device 'switch0' config interface 'vlan5' @@ -50,7 +48,6 @@ config interface 'vlan5' config interface 'vlan24' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.24' option macaddr 'de:ad:be:ef:90:60' diff --git a/Richtfunk/bb-flora-kern/etc/config/snmpd b/Richtfunk/bb-flora-kern/etc/config/snmpd new file mode 100644 index 0000000..11f6df5 --- /dev/null +++ b/Richtfunk/bb-flora-kern/etc/config/snmpd @@ -0,0 +1,43 @@ +config agent + option agentaddress UDP6:161 + +config com2sec6 readonly + option secname ro + option source default + option community ffrichtfunk + +config group public_v2c + option group MyROGroup + option version v2c + option secname ro + +config group public_usm + option group MyROGroup + option version usm + option secname ro + +config view all + option viewname all + option type included + option oid .1 + option mask 80 + +config access public_access + option group MyROGroup + option context none + option version any + option level noauth + option prefix exact + option read all + option write none + option notify none + +config system + option sysLocation 'null' + option sysContact 'richtfunk@hamburg.freifunk.net' + +config exec + option name filedescriptors + option prog /bin/cat + option args /proc/sys/fs/file-nr +# option miboid 1.2.3.4 diff --git a/Richtfunk/bb-fux-kern/etc/config/network b/Richtfunk/bb-fux-kern/etc/config/network index 3632780..1b64fa9 100644 --- a/Richtfunk/bb-fux-kern/etc/config/network +++ b/Richtfunk/bb-fux-kern/etc/config/network @@ -23,45 +23,43 @@ config switch_vlan config switch_vlan option vlan '5' option ports '0t 2t' - option vid '5' option device 'switch0' +config switch_vlan + option vlan '6' + option ports '0t 2t' + option device 'switch0' + config switch_vlan option vlan '10' option ports '0t 2t' - option vid '10' option device 'switch0' config switch_vlan option vlan '20' option ports '0t 2t' - option vid '20' option device 'switch0' config switch_vlan option vlan '11' option ports '0t 2t' - option vid '11' option device 'switch0' config switch_vlan option vlan '22' option ports '0t 2t' - option vid '22' option device 'switch0' -config switch_vlan - option vlan '23' - option ports '0t 2t' - option vid '23' - option device 'switch0' +config switch_vlan + option vlan '23' + option ports '0t 2t' + option device 'switch0' + +config switch_vlan + option vlan '26' + option ports '0t 2t' + option device 'switch0' -config switch_vlan - option vlan '26' - option ports '0t 2t' - option vid '26' - option device 'switch0' - config interface 'vlan5' option proto 'static' option ifname 'eth0.5' @@ -71,45 +69,39 @@ config interface 'vlan5' config interface 'vlan10' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.10' option macaddr 'de:ad:be:ef:90:10' config interface 'vlan20' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.20' option macaddr 'de:ad:be:ef:90:11' config interface 'vlan11' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.11' option macaddr 'de:ad:be:ef:90:12' config interface 'vlan22' option proto 'batadv' option mesh 'bat0' - option mtu '1500' option ifname 'eth0.22' option macaddr 'de:ad:be:ef:90:13' - -config interface 'vlan23' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.23' - option macaddr 'de:ad:be:ef:90:14' -config interface 'vlan26' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.26' - option macaddr 'de:ad:be:ef:90:15' - +config interface 'vlan23' + option proto 'batadv' + option mesh 'bat0' + option ifname 'eth0.23' + option macaddr 'de:ad:be:ef:90:14' + +config interface 'vlan26' + option proto 'batadv' + option mesh 'bat0' + option ifname 'eth0.26' + option macaddr 'de:ad:be:ef:90:15' + config interface 'wan' option ifname 'eth0.2' option type 'bridge' @@ -120,7 +112,7 @@ config interface 'wan' option igmp_snooping '0' config interface 'client' - option ifname 'eth0.1 bat0' + option ifname 'eth0.1 eth0.6 bat0' option type 'bridge' option proto 'dhcpv6' option reqprefix 'no' @@ -165,6 +157,13 @@ config route 'local_node_route4' option netmask '255.255.192.0' option interface 'client' +config interface 'mesh_lan' + option ifname 'eth0.1' + option auto '0' + option macaddr 'fa:1b:68:d8:df:d2' + option mesh 'bat0' + option proto 'batadv' + config interface 'bat0' option ifname 'bat0' option macaddr 'f8:1a:67:d8:df:d2' @@ -180,13 +179,6 @@ config interface 'mesh_radio1' option proto 'batadv' option mtu '1528' -config interface 'mesh_lan' - option ifname 'eth0.1' - option auto '0' - option macaddr 'fa:1b:68:d8:df:d2' - option mesh 'bat0' - option proto 'batadv' - config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' diff --git a/Richtfunk/bb-fux-kern/etc/config/snmpd b/Richtfunk/bb-fux-kern/etc/config/snmpd index ac726c0..a259476 100644 --- a/Richtfunk/bb-fux-kern/etc/config/snmpd +++ b/Richtfunk/bb-fux-kern/etc/config/snmpd @@ -6,12 +6,6 @@ config com2sec6 readonly option source default option community ffrichtfunk -config group public_v1 - option group MyROGroup - option version v1 - option secname ro - - config group public_v2c option group MyROGroup option version v2c @@ -39,7 +33,7 @@ config access public_access option notify none config system - option sysLocation 'fux, Zeiseweg 9, 22765 Hamburg' + option sysLocation 'Zeiseweg 9, 22765 Hamburg' option sysContact 'richtfunk@hamburg.freifunk.net' # option sysName 'bb-fux-kern' # option sysServices 72 diff --git a/Richtfunk/bb-stpaulikirche-kern/etc/config/network b/Richtfunk/bb-stpaulikirche-kern/etc/config/network index 94f12d7..17a0877 100644 --- a/Richtfunk/bb-stpaulikirche-kern/etc/config/network +++ b/Richtfunk/bb-stpaulikirche-kern/etc/config/network @@ -30,42 +30,37 @@ config switch_vlan option ports '0t 1' config switch_vlan - option vlan '5' - option ports '0t 2t' - option vid '5' - option device 'switch0' + option vlan '5' + option ports '0t 2t' + option device 'switch0' config switch_vlan - option vlan '10' - option ports '0t 2t' - option vid '10' - option device 'switch0' + option vlan '10' + option ports '0t 2t' + option device 'switch0' -config switch_vlan - option vlan '25' - option ports '0t 2t' - option vid '25' - option device 'switch0' +config switch_vlan + option vlan '25' + option ports '0t 2t' + option device 'switch0' -config interface 'vlan5' - option proto 'static' - option ifname 'eth0.5' - option ipaddr '192.168.112.24' - option netmask '255.255.255.0' - -config interface 'vlan10' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.10' - option macaddr 'de:ad:be:ef:90:50' - -config interface 'vlan25' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth0.25' - option macaddr 'de:ad:be:ef:90:51' +config interface 'vlan5' + option proto 'static' + option ifname 'eth0.5' + option ipaddr '192.168.112.24' + option netmask '255.255.255.0' + +config interface 'vlan10' + option proto 'batadv' + option mesh 'bat0' + option ifname 'eth0.10' + option macaddr 'de:ad:be:ef:90:50' + +config interface 'vlan25' + option proto 'batadv' + option mesh 'bat0' + option ifname 'eth0.25' + option macaddr 'de:ad:be:ef:90:51' config interface 'wan' option igmp_snooping '0' @@ -97,21 +92,6 @@ config interface 'client' option macaddr 'f8:1a:67:ca:92:24' option peerdns '1' -config interface 'bat0' - option ifname 'bat0' - option macaddr 'f8:1a:67:ca:92:24' - option proto 'none' - -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - -config interface 'mesh_radio1' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - config interface 'mesh_wan' option auto '0' option ifname 'br-wan' @@ -132,6 +112,21 @@ config interface 'mesh_vpn' option mesh 'bat0' option proto 'batadv' +config interface 'bat0' + option ifname 'bat0' + option macaddr 'f8:1a:67:ca:92:24' + option proto 'none' + +config interface 'mesh_radio0' + option mesh 'bat0' + option proto 'batadv' + option mtu '1528' + +config interface 'mesh_radio1' + option mesh 'bat0' + option proto 'batadv' + option mtu '1528' + config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client' diff --git a/Richtfunk/bb-werkhof-kern/etc/config/network b/Richtfunk/bb-werkhof-kern/etc/config/network index 7198081..ffd18b7 100644 --- a/Richtfunk/bb-werkhof-kern/etc/config/network +++ b/Richtfunk/bb-werkhof-kern/etc/config/network @@ -30,43 +30,49 @@ config switch_vlan option ports '5 6' config switch_vlan - option device 'switch0' - option vlan '5' - option ports '0t 4t' - option vid '5' + option device 'switch0' + option vlan '5' + option ports '0t 4t' config switch_vlan - option device 'switch0' - option vlan '10' - option ports '0t 4t' - option vid '10' + option device 'switch0' + option vlan '10' + option ports '0t 4t' config switch_vlan - option device 'switch0' - option vlan '22' - option ports '0t 4t' - option vid '22' + option device 'switch0' + option vlan '22' + option ports '0t 4t' +config switch_vlan + option device 'switch0' + option vlan '27' + option ports '0t 4t' + config interface 'vlan5' - option proto 'static' - option ifname 'eth1.5' - option ipaddr '192.168.112.17' - option netmask '255.255.255.0' + option proto 'static' + option ifname 'eth1.5' + option ipaddr '192.168.112.17' + option netmask '255.255.255.0' -config interface 'vlan10' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth1.10' - option macaddr 'de:ad:be:ef:90:30' - -config interface 'vlan22' - option proto 'batadv' - option mesh 'bat0' - option mtu '1500' - option ifname 'eth1.22' - option macaddr 'de:ad:be:ef:90:31' +config interface 'vlan10' + option proto 'batadv' + option mesh 'bat0' + option ifname 'eth1.10' + option macaddr 'de:ad:be:ef:90:30' +config interface 'vlan22' + option proto 'batadv' + option mesh 'bat0' + option ifname 'eth1.22' + option macaddr 'de:ad:be:ef:90:31' + +config interface 'vlan27' + option proto 'batadv' + option mesh 'bat0' + option ifname 'eth1.27' + option macaddr 'de:ad:be:ef:90:32' + config interface 'wan' option igmp_snooping '0' option ifname 'eth0' @@ -74,6 +80,7 @@ config interface 'wan' option peerdns '0' option type 'bridge' option proto 'dhcp' + option macaddr '16:cd:20:4d:3d:68' config rule6 'wan6_lookup' option mark '0x01/0x01' @@ -96,16 +103,6 @@ config interface 'client' option macaddr '14:cc:20:4d:3d:68' option peerdns '1' -config interface 'bat0' - option ifname 'bat0' - option macaddr '14:cc:20:4d:3d:68' - option proto 'none' - -config interface 'mesh_radio0' - option mesh 'bat0' - option proto 'batadv' - option mtu '1528' - config interface 'mesh_wan' option auto '0' option ifname 'br-wan' @@ -126,6 +123,16 @@ config interface 'mesh_vpn' option mesh 'bat0' option proto 'batadv' +config interface 'bat0' + option ifname 'bat0' + option macaddr '14:cc:20:4d:3d:68' + option proto 'none' + +config interface 'mesh_radio0' + option mesh 'bat0' + option proto 'batadv' + option mtu '1528' + config device 'local_node_dev' option macaddr '16:41:95:40:f7:dc' option ifname 'br-client'