Removed Legacy Segment, moved global mesh settings to site.conf

.gitignore

@@ -0,0 +1,2 @@
+/output/
+/gluon-build/

Makefile

@@ -6,19 +6,18 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
 	ar71xx-generic \
-	ar71xx-tiny\
+	x86-64 \
-#	x86-64 \
+	ar71xx-tiny \
-#	ar71xx-tiny \
+	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 \
+	x86-geode \
-#	x86-geode \
+	sunxi
-#	sunxi
 
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)

domains/ffrgb.conf

@@ -1,109 +0,0 @@
-{
-  domain_names = { ffrgb = 'Legacy' },
-  domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
-  hide_domain = true,
-
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
-
-  prefix4 = '10.90.0.0/19',
-  prefix6 = 'fdef:f00f:1337:cafe::/64',
-
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
-
-  wifi24 = {
-    channel = 1,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      ssid = 'mesh.ffrgb',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      ssid = 'mesh.ffrgb',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    }
-  },
-
-  dns = {
-    cacheentries = 500,
-    servers = { 'fdef:f00f:1337:cafe::11', },
-  },
-
-  next_node = {
-    name = { 'nextnode.ffrgb', 'nextnode', 'nn' },
-    ip4 = '10.90.0.1',
-    ip6 = 'fdef:f00f:1337:cafe::1',
-    mac = '16:41:95:40:f7:dd',
-  },
-
-  mesh = {
-    vxlan = false,
-    filter_membership_reports = false,
-    batman_adv = {
-      gw_sel_class = 1,
-    },
-  },
-
-  mesh_vpn = {
-    mtu = 1426,
-    fastd = {
-      groups = {
-        backbone = {
-          limit = 2,
-          peers = {
-            gw01 = {   --[[ sven ]]
-              key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
-              remotes = {
-                'ipv4 "78.47.168.108" port 10000',
-              },
-            },
-            gw02 = {   --[[ alamar ]]
-              key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
-              remotes = {
-                'ipv4 "185.53.218.23" port 10000',
-              },
-            },
-            gw04 = {   --[[ mephisto ]]
-              key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
-              remotes = {
-                'ipv4 "213.166.225.5" port 10000',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-
-  autoupdater = {
-    enabled = 1,
-    branches = {
-      stable = {
-        mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
-        },
-      },
-      experimental = {
-        mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
-        },
-      },
-    },
-  },
-}
--- vim: set ft=lua:ts=2:sw=2:et

domains/ffrgb_cty.conf

@@ -24,11 +24,9 @@
     ibss = {
       ssid = 'mesh.ffrgb_cty',
       bssid = '02:0E:8E:1E:61:01',
-      mcast_rate = 12000,
     },
     mesh = {
       id = 'loo23eWueg11s',
-      mcast_rate = 12000,
     },
   },
 
@@ -41,8 +39,10 @@
     ibss = {
       ssid = 'mesh.ffrgb_cty',
       bssid = '02:0E:8E:1E:61:01',
-      mcast_rate = 12000,
+    },
-    }
+    mesh = {
+      id = 'loo23eWueg11s',
+    },
   },
 
   dns = {

domains/ffrgb_tst.conf

@@ -25,11 +25,9 @@
     ibss = {
       ssid = 'mesh.ffrgb_test',
       bssid = '02:0E:8E:1E:61:03',
-      mcast_rate = 12000,
     },
     mesh = {
       id = 'mesh_ffrgb_tst_11s',
-      mcast_rate = 12000,
     },
   },
 
@@ -42,8 +40,10 @@
     ibss = {
       ssid = 'mesh.ffrgb_test',
       bssid = '02:0E:8E:1E:61:03',
-      mcast_rate = 12000,
+    },
-    }
+    mesh = {
+      id = 'mesh_ffrgb_tst_11s',
+    },
   },
 
   dns = {

domains/ffrgb_uml.conf

@@ -24,11 +24,9 @@
     ibss = {
       ssid = 'mesh.ffrgb_uml',
       bssid = '02:0E:8E:1E:61:02',
-      mcast_rate = 12000,
     },
     mesh = {
       id = 'Ishei42esh11s',
-      mcast_rate = 12000,
     },
   },
 
@@ -41,8 +39,10 @@
     ibss = {
       ssid = 'mesh.ffrgb_uml',
       bssid = '02:0E:8E:1E:61:02',
-      mcast_rate = 12000,
+    },
-    }
+    mesh = {
+      id = 'Ishei42esh11s',
+    },
   },
 
   dns = {

site.conf

@@ -2,7 +2,7 @@
   hostname_prefix = '',
   site_name = 'Freifunk Regensburg',
   site_code = 'ffrgb',
-  default_domain = 'ffrgb',
+  default_domain = 'ffrgb_cty',
 
   opkg = {
     --[[ old
@@ -22,6 +22,21 @@
     -- disable 802.11b support:
     supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}, -- List of supported wifi rates (optional)
     basic_rate = {6000, 9000, 18000, 36000, 54000}, -- List of basic wifi rates (optional, required if supported_rates is set)
+    mesh = {
+      mcast_rate = 12000,
+    },
+    ibss = {
+      mcast_rate = 12000,
+    },
+  },
+
+  wifi5 = {
+    mesh = {
+      mcast_rate = 12000,
+    },
+    ibss = {
+      mcast_rate = 12000,
+    },
   },
 
   mesh_vpn = {

site.mk

@@ -213,5 +213,5 @@ GLUON_PRIORITY ?= 0
 
 # Languages to include
 GLUON_LANGS ?= en de
-GLUON_WLAN_MESH := 11s
+GLUON_WLAN_MESH := ibss
 GLUON_MULTIDOMAIN=1