Browse Source

Add ebtables package and vpn key of gw08

Michael Schwarz 9 years ago
parent
commit
5e161bb733
3 changed files with 13 additions and 3 deletions
  1. 1 1
      modules
  2. 9 0
      site.conf
  3. 3 2
      site.mk

+ 1 - 1
modules

@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffpb'
 
 PACKAGES_FFPB_REPO=http://git.c3pb.de/freifunk-pb/ffpb-packages.git
-PACKAGES_FFPB_COMMIT=f2d788633930dfdc170802aad8b899f9d3ca7208
+PACKAGES_FFPB_COMMIT=50f09e3e912dde88d8b3864e7252348fc045dad8

+ 9 - 0
site.conf

@@ -133,6 +133,15 @@
 						'ipv4 "5.45.111.222" port 10000',
 					},
 				},
+				gw08 = {
+					key = '3da050bbf1c3e95af286af65553f546fd563d9cb5d4b3b3444069bef281de621',
+					remotes = {
+						'ipv6 "v6.gw08.paderborn.freifunk.net" port 10000',
+						'ipv4 "v4.gw08.paderborn.freifunk.net" port 10000',
+						'ipv6 "2a03:4000:6:1151::ff12" port 10000',
+						'ipv4 "5.45.107.59" port 10000',
+					},
+				},
 			},
 		},
 	},

+ 3 - 2
site.mk

@@ -3,7 +3,8 @@ GLUON_SITE_PACKAGES := \
 	ffpb-alfred-watchdog \
 	ffpb-banner \
 	ffpb-debug \
-        ffpb-node-tuning \
+    ffpb-node-tuning \
+	ffpb-ebtables-net-rules \
 	ffpb-openwrt-migration-tools \
 	gluon-alfred \
 	gluon-announced \
@@ -27,7 +28,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.6.1~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)