瀏覽代碼

Update to actual commit id of ffpb-packages

remove needless newlines from site.conf
Karsten Böddeker 8 年之前
父節點
當前提交
21a6c1849b
共有 2 個文件被更改,包括 9 次插入13 次删除
  1. 1 1
      modules
  2. 8 12
      site.conf

+ 1 - 1
modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffpb'
 
 PACKAGES_FFPB_REPO=http://git.c3pb.de/freifunk-pb/ffpb-packages.git
 PACKAGES_FFPB_BRANCH=11s-mesh
-PACKAGES_FFPB_COMMIT=2ffbbe1e61f57ecacb4f1b90c9bff5bc849cedef
+PACKAGES_FFPB_COMMIT=1bed600d65f9fc60da9736470f6b13edc928ab4c

+ 8 - 12
site.conf

@@ -35,12 +35,10 @@
 		ap = {
 			ssid = 'paderborn.freifunk.net',
 		},
-		
 		mesh = {
 			id = 'FFHO-PAD-MESH',
 			mcast_rate = 12000,
 		},
-		
 		ibss = {
 			ssid = '02:d1:11:13:87:ad',
 			bssid = '02:d1:11:13:87:ad',
@@ -48,7 +46,7 @@
 			disabled = true,
 		},
 	},
-	
+
 	-- Wireless configuration for 5 GHz interfaces.
 	wifi5 = {
 		channel = 44,
@@ -56,16 +54,14 @@
 		ap = {
 			ssid = 'paderborn.freifunk.net (5GHz)',
 		},
-		
-        mesh = {
+		mesh = {
 			id = 'FFHO-PAD-MESH',
-            mcast_rate = 12000,
-        },
-		
-        ibss = {
-            ssid = '02:d1:11:13:87:ad',
-            bssid = '02:d1:11:13:87:ad',
-            mcast_rate = 12000,
+			mcast_rate = 12000,
+		},
+		ibss = {
+			ssid = '02:d1:11:13:87:ad',
+			bssid = '02:d1:11:13:87:ad',
+			mcast_rate = 12000,
 			disabled = true,
         },
 	},