Domainsplit preparation

Makefile

@@ -1,5 +1,5 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
+GLUON_GIT_URL := https://github.com/ffrgb/gluon
 GLUON_GIT_REF := v2016.2.6
 
 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
@@ -8,16 +8,16 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
 	ar71xx-generic \
-	ar71xx-nand \
+	ar71xx-nand #\
-	brcm2708-bcm2708 \
+#	brcm2708-bcm2708 \
-	brcm2708-bcm2709 \
+#	brcm2708-bcm2709 \
-	mpc85xx-generic \
+#	mpc85xx-generic \
-	ramips-mt7621 \
+#	ramips-mt7621 \
-	ramips-rt305x \
+#	ramips-rt305x \
-	x86-64 \
+#	x86-64 \
-	x86-generic \
+#	x86-generic \
-	sunxi \
+#	sunxi \
-	x86-kvm_guest 
+#	x86-kvm_guest 
 	
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)

extra/default.conf

@@ -0,0 +1,18 @@
+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'
+}

extra/template.conf

@@ -0,0 +1,135 @@
+{
+  hostname_prefix = '',
+  site_name = 'Freifunk Regensburg',
+  site_code = '%SC',
+
+  opkg = {
+    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
+  },
+
+  prefix4 = '%V4',
+  prefix6 = '%V6',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
+
+  mesh_on_wan = true,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    channel = 1,
+    ap = {
+      ssid = '%SS',
+    },
+    ibss = {
+      ssid = '%IB',
+      bssid = '%BS',
+      mcast_rate = 12000,
+    },
+  },
+
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = '%SS',
+    },
+    ibss = {
+      ssid = '%IB',
+      bssid = '%BS',
+      mcast_rate = 12000,
+    }
+  },
+
+  next_node = {
+    ip4 = '%N4',
+    ip6 = 'fdef:f00f:1337:%ID::1',
+    mac = '%NN',
+  },
+
+
+  fastd_mesh_vpn = {
+    bandwidth_limit = {
+      enabled = false,
+      ingress = 12000,
+      egress = 1200,
+    },
+    methods = {'salsa2012+umac'},
+    mtu = %MT,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gw01-1 = {   --[[ pri gw instance 1 ]]
+            key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
+            remotes = {
+              'ipv4 "%PRI" port 10%ID0',
+            },
+          },
+          gw01-2 = {   --[[ pri gw instance 2 ]]
+            key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
+            remotes = {
+              'ipv4 "%PRI" port 10%ID1',
+            },
+          },
+          gw01-3 = {   --[[ pri gw instance 3 ]]
+            key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
+            remotes = {
+              'ipv4 "%PRI" port 10%ID2',
+            },
+          },
+          gw02-1 = {   --[[ sec gw instance 1 ]]
+            key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
+            remotes = {
+              'ipv4 "%SEC" port 10%ID0',
+            },
+          },
+          gw02-2 = {   --[[ sec gw instance 2 ]]
+            key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
+            remotes = {
+              'ipv4 "%SEC" port 10%ID1',
+            },
+          },
+          gw02-2 = {   --[[ sec gw instance 3 ]]
+            key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
+            remotes = {
+              'ipv4 "%SEC" port 10%ID2',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/',
+        },
+        good_signatures = 1,
+        pubkeys = {
+          '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
+          '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
+	  'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/',
+        },
+        good_signatures = 1,
+        pubkeys = {
+          '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
+	  '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
+	  'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
+        },
+      },
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et

site.mk

@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-ebtables-filter-arp-ffmuc \
 	gluon-ebtables-filter-multicast-ffmuc \
 	gluon-ssid-changer \
-	respondd-module-airtime \ 
+	respondd-module-airtime \
 	gluon-config-mode-site-select 
 
 # basic support for USB stack