merged changes from a1d3s:alpha

site.conf

@@ -2,33 +2,49 @@
         hostname_prefix = 'ffs',
         site_name = 'Freifunk Stuttgart',
         site_code = 'ffs',
-
-        prefix4 = '172.21.0.0/18',
+	
+	opkg = {
+		openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+		},
+	
+	prefix4 = '172.21.0.0/18',
         prefix6 = 'fd21:b4dc:4b1e::/64',
-
-        timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-        ntp_servers = {
+        
+	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
+        
+	ntp_servers = {
             'fd21:b4dc:4b1e::a38:1', -- gw01
         },
-        opkg_repo = 'http://[fd21:b4dc:4b1e::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
+        
         regdom = 'DE',
 
-        wifi24 = {
-                ssid = 'Freifunk',
-                channel = 1,
-                htmode = 'HT20',
-                mesh_ssid = '02:04:08:16:32:64',
-                mesh_bssid = '02:04:08:16:32:64',
-                mesh_mcast_rate = 12000,
-        },
-        wifi5 = {
-                ssid = 'Freifunk',
-                channel = 44,
-                htmode = 'HT20',
-                mesh_ssid = '02:04:08:16:32:64',
-                mesh_bssid = '02:04:08:16:32:64',
-                mesh_mcast_rate = 12000,
-        },
+        
+	wifi24 = {
+		channel = 1,
+		htmode = 'HT20', --only for optic 
+		ap = {
+			ssid = 'Freifunk',
+		},
+		ibss = {
+			ssid = '02:04:08:16:32:64',
+			bssid = '02:04:08:16:32:64',
+			mcast_rate = 12000,
+		},
+	},
+
+	wifi5 = {
+		channel = 44,
+		htmode = 'HT20', --only for optic
+		ap = {
+			ssid = 'Freifunk',
+		},
+		ibss = {
+			ssid = '02:04:08:16:32:64',
+			bssid = '02:04:08:16:32:64',
+			mcast_rate = 12000,
+		},
+	},
+
 
         next_node = {
                 ip4 = '172.21.24.254',
@@ -87,6 +103,13 @@
 				},
 			},
 		},
+	},
+	
+	bandwidth_limit = {
+	-- Default upload limit (kbit/s).
+        egress = 500,
+        -- Default download limit (kbit/s).
+        ingress = 15000,
         },
 
         autoupdater = {
@@ -132,16 +155,4 @@
                 },
         },
 
-        simple_tc = {
-                mesh_vpn = {
-                        ifname = 'mesh-vpn',
-                        enabled = false,
-                        limit_egress = 400,
-                        limit_ingress = 6000,
-                },
-        },
-
-        -- enable BATMAN on WAN interface by default (see gluon-luci-portconfig for webinterface)
-        mesh_on_wan = false,
-
 }