2016.2.7 - Lauenburg

freifunk-rz · Feb 12, 2018 · 9e9f951 · 9e9f951
1 parent fd5e130
commit 9e9f951
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 126 deletions.
diff --git a/i18n/de.po b/i18n/de.po
@@ -12,7 +12,7 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Stormarner "
+"Willkommen zum Einrichtungsassistenten für deinen neuen Lauenburger "
 "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
 "entsprechend aus und sende es ab."
 
@@ -32,8 +32,8 @@ msgstr ""
 "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, "
 "sich mit anderen Freifunkknoten in seiner Nähe zu "
 "verbinden. Weitere Informationen zur "
-"Stormarner Freifunk-Community findest du auf "
-"<a href=\"https://freifunk-stormarn.de/\">unserer Webseite</a>.</p>"
+"Lauenburger Freifunk-Community findest du auf "
+"<a href=\"https://lauenburg.freifunk.net/\">unserer Webseite</a>.</p>"
 "<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
 "Betrieb für drei Sekunden den Reset-Button. Das Gerät wird dann im Config "
 "Mode neustarten.</p>"

diff --git a/i18n/en.po b/i18n/en.po
@@ -12,13 +12,13 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk Stormarn node. "
+"Welcome the the setup wizard of your new Freifunk Lauenburg node. "
 "Please fill out the following form and transmit it."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "<p>This is your Freifunk node's public key. "
-"Freifunk Stormarn is free, no registration. "
+"Freifunk Lauenburg is free, no registration. "
 "Have fun. "
 "</p>"
 "<div class=\"the-key\">"
@@ -32,8 +32,8 @@ msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>The node is currently rebooting and will try to connect to other "
 "nearby Freifunk nodes  after that. "
-"Your can find lots of information on the Freifunk Stormarn community on "
-"<a href=\"https://freifunk-stormarn.de/\">our homepage</a>.</p>"
+"Your can find lots of information on the Freifunk Lauenburg community on "
+"<a href=\"https://lauenburg.freifunk.net/\">our homepage</a>.</p>"
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "
 "mode.</p>"

diff --git a/modules b/modules
@@ -1,7 +1,7 @@
-GLUON_SITE_FEEDS="ssidchanger"
-PACKAGES_SSIDCHANGER_REPO=https://github.com/ffod/packages-ffod.git
-PACKAGES_SSIDCHANGER_COMMIT=3339921dac0f250e668fe403f4cefd94e3c7c89e
-PACKAGES_SSIDCHANGER_BRANCH=master
+#GLUON_SITE_FEEDS="ssidchanger"
+#PACKAGES_SSIDCHANGER_REPO=https://github.com/ffod/packages-ffod.git
+#PACKAGES_SSIDCHANGER_COMMIT=3339921dac0f250e668fe403f4cefd94e3c7c89e
+#PACKAGES_SSIDCHANGER_BRANCH=master
 
 ##	GLUON_SITE_FEEDS
 #		for each feed name given, add the corresponding PACKAGES_* lines

diff --git a/site.conf b/site.conf
@@ -1,6 +1,6 @@
 {
-  site_name = 'Freifunk Stormarn',
-  site_code = 'ffod',
+  site_name = 'Freifunk Lauenburg',
+  site_code = 'ffrz',
 
   prefix4 = '10.144.0.0/20',
   prefix6 = 'fddf:0bf7:80::/64',
@@ -12,9 +12,9 @@
 
   wifi24 = {
     channel = 1,
-	htmode = 'HT20',
+    htmode = 'HT20',
     ap = {
-      ssid = 'stormarn.freifunk.net',
+      ssid = 'lauenburg.freifunk.net',
     },
     mesh = {
       id = 'shso-mesh',
@@ -24,9 +24,9 @@
 
   wifi5 = {
     channel = 44,
-	htmode = 'HT40+',
+    htmode = 'HT40+',
     ap = {
-      ssid = 'stormarn.freifunk.net',
+      ssid = 'lauenburg.freifunk.net',
     },
     mesh = {
       id = 'shso-mesh',
@@ -50,58 +50,58 @@
     groups = {
       backbone = {
         limit = 1,
-		peers = {
-			barnitz = {
-			key = '5b62aa6334bb3c6fedd481b7f83f78718f02f1c2144f16d1500154f8b7c89b9d',
-			remotes = {'"barnitz.freifunk-stormarn.de" port 10000'},
-			},
-			beste = {
-			key = '94a752e1db826a5ddcc9a46eadb06527204715f5c8ae803f747408c057a3283e',
-			remotes = {'"beste.freifunk-stormarn.de" port 10000'},
-			},
-			bille = {
-			key = 'ab494de7feb417a129cb57d0d1a1a193e0b5026e105781086ba14759dfc04bdf',
-			remotes = {'"bille.freifunk-stormarn.de" port 10000'},
-			},
-			brunsbach = {
-			key = '3378ca799e201785253607bfa1a3de352eb982460be4d950d44a90289a4e7bbb',
-			remotes = {'"brunsbach.freifunk-stormarn.de" port 10000'},
-			},
-			heilsau = {
-			key = 'dae50ccc6e6bb68171d148afb79a5ff5f3cff36fd517d35a065ae84deb48ae3b',
-			remotes = {'"heilsau.freifunk-stormarn.de" port 10000'},
-			},
-			hopfenbach = {
-			key = '64aa9ab05e16fe2625443e7f51dd7cc5ded8938fa33ce4388dcff91093b15137',
-			remotes = {'"hopfenbach.freifunk-stormarn.de" port 10000'},
-			},
-			krummbach = {
-			key = '3cb32646bb55aca60d0dfad0c39a111f4ef99aa8bdbc9a12a6365e96f419eee9',
-			remotes = {'"krummbach.freifunk-stormarn.de" port 10000'},
-			},
-			piepenbek = {
-			key = 'eeedf2df162da628d95301e7eea57e1b2545114a09a397e91a38f770b1150c00',
-			remotes = {'"piepenbek.freifunk-stormarn.de" port 10000'},
-			},
-			strusbek = {
-			key = 'dfecf511f7373c539cd81b7f2f0a3bc01e1a3a3046de77923bfd1f61fcea0e49',
-			remotes = {'"strusbek.freifunk-stormarn.de" port 10000'},
-			},
-			syslbek = {
-			key = 'ecc8dda94b35abbb9a7a5ec22b8deef7b6cfec496ad9fa47819b2057669608c2',
-			remotes = {'"syslbek.freifunk-stormarn.de" port 10000'},
-			},
-			trave = {
-			key = '268b5575dd68a92b7700348c6d23d0e118ed6f2c640768fccd6311bd9469e1ca',
-			remotes = {'"trave.freifunk-stormarn.de" port 10000'},
-			},
-			viehbach = {
-			key = '5f2fb25e7969cd3140cb0fc229fb43257f46237d6845cb90bb863500fed1f118',
-			remotes = {'"viehbach.freifunk-stormarn.de" port 10000'},
-			},
-		},
-	  },
-	},
+        peers = {
+            barnitz = {
+            key = '5b62aa6334bb3c6fedd481b7f83f78718f02f1c2144f16d1500154f8b7c89b9d',
+            remotes = {'"barnitz.freifunk-stormarn.de" port 10000'},
+            },
+            beste = {
+            key = '94a752e1db826a5ddcc9a46eadb06527204715f5c8ae803f747408c057a3283e',
+            remotes = {'"beste.freifunk-stormarn.de" port 10000'},
+            },
+            bille = {
+            key = 'ab494de7feb417a129cb57d0d1a1a193e0b5026e105781086ba14759dfc04bdf',
+            remotes = {'"bille.freifunk-stormarn.de" port 10000'},
+            },
+            brunsbach = {
+            key = '3378ca799e201785253607bfa1a3de352eb982460be4d950d44a90289a4e7bbb',
+            remotes = {'"brunsbach.freifunk-stormarn.de" port 10000'},
+            },
+            heilsau = {
+            key = 'dae50ccc6e6bb68171d148afb79a5ff5f3cff36fd517d35a065ae84deb48ae3b',
+            remotes = {'"heilsau.freifunk-stormarn.de" port 10000'},
+            },
+            hopfenbach = {
+            key = '64aa9ab05e16fe2625443e7f51dd7cc5ded8938fa33ce4388dcff91093b15137',
+            remotes = {'"hopfenbach.freifunk-stormarn.de" port 10000'},
+            },
+            krummbach = {
+            key = '3cb32646bb55aca60d0dfad0c39a111f4ef99aa8bdbc9a12a6365e96f419eee9',
+            remotes = {'"krummbach.freifunk-stormarn.de" port 10000'},
+            },
+            piepenbek = {
+            key = 'eeedf2df162da628d95301e7eea57e1b2545114a09a397e91a38f770b1150c00',
+            remotes = {'"piepenbek.freifunk-stormarn.de" port 10000'},
+            },
+            strusbek = {
+            key = 'dfecf511f7373c539cd81b7f2f0a3bc01e1a3a3046de77923bfd1f61fcea0e49',
+            remotes = {'"strusbek.freifunk-stormarn.de" port 10000'},
+            },
+            syslbek = {
+            key = 'ecc8dda94b35abbb9a7a5ec22b8deef7b6cfec496ad9fa47819b2057669608c2',
+            remotes = {'"syslbek.freifunk-stormarn.de" port 10000'},
+            },
+            trave = {
+            key = '268b5575dd68a92b7700348c6d23d0e118ed6f2c640768fccd6311bd9469e1ca',
+            remotes = {'"trave.freifunk-stormarn.de" port 10000'},
+            },
+            viehbach = {
+            key = '5f2fb25e7969cd3140cb0fc229fb43257f46237d6845cb90bb863500fed1f118',
+            remotes = {'"viehbach.freifunk-stormarn.de" port 10000'},
+            },
+        },
+      },
+    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,
@@ -110,34 +110,42 @@
   },
 
   autoupdater = {
-    branch = 'experimental',
-#    branch = 'beta',
-#    branch = 'stable',
+    branch = 'stable',
     branches = {
-		stable = {
-			name = 'stable',
-			mirrors = {'http://firmware.freifunk-stormarn.de/stable/sysupgrade'},
-			good_signatures = 1,
-			pubkeys = {
-				'e7abbd532eee49541129e1d5481b74e2d6cc1da78bb2a2f8278085c0761f685a', -- kst
-				'edbfe3c4a0448812c9aa348cebb8794d700077677a096692ac9285a659840556', -- ulf			},
-		},
-		beta = {
-			name = 'beta',
-			mirrors = {'http://firmware.freifunk-stormarn.de/beta/sysupgrade'},
-			good_signatures = 1,
-			pubkeys = {
-				'e7abbd532eee49541129e1d5481b74e2d6cc1da78bb2a2f8278085c0761f685a', -- kst
-				'edbfe3c4a0448812c9aa348cebb8794d700077677a096692ac9285a659840556', -- ulf			},
-		},
-		experimental = {
-			name = 'experimental',
-			mirrors = {'http://firmware.freifunk-stormarn.de/experimental/sysupgrade'},
-			good_signatures = 1,
-			pubkeys = {
-				'e7abbd532eee49541129e1d5481b74e2d6cc1da78bb2a2f8278085c0761f685a', -- kst
-				'edbfe3c4a0448812c9aa348cebb8794d700077677a096692ac9285a659840556', -- ulf			},
-		},
+        stable = {
+            name = 'stable',
+            mirrors = {'http://firmware.freifunk-lauenburg.de/stable/sysupgrade'},
+            good_signatures = 1,
+            pubkeys = {
+                'e7abbd532eee49541129e1d5481b74e2d6cc1da78bb2a2f8278085c0761f685a', -- kst
+                'edbfe3c4a0448812c9aa348cebb8794d700077677a096692ac9285a659840556', -- ulf
+                '3a5dd9cbdfc6b1a858a11c32354b35fd09c37ea2ef1297109d1332c82950508a', -- haudrauf
+                '69a9e9ad28d86d1619ae596b5f7ba1be3cc42f877d673757a9daf1f0ee7231d0', -- grotax
+            },
+        },
+        rc = {
+            name = 'rc',
+            mirrors = {'http://firmware.freifunk-lauenburg.de/rc/sysupgrade'},
+            good_signatures = 1,
+            pubkeys = {
+                'e7abbd532eee49541129e1d5481b74e2d6cc1da78bb2a2f8278085c0761f685a', -- kst
+                'edbfe3c4a0448812c9aa348cebb8794d700077677a096692ac9285a659840556', -- ulf
+                '3a5dd9cbdfc6b1a858a11c32354b35fd09c37ea2ef1297109d1332c82950508a', -- haudrauf
+                '69a9e9ad28d86d1619ae596b5f7ba1be3cc42f877d673757a9daf1f0ee7231d0', -- grotax
+            },
+
+        },
+        testing = {
+            name = 'testing',
+            mirrors = {'http://firmware.freifunk-lauenburg.de/testing/sysupgrade'},
+            good_signatures = 1,
+            pubkeys = {
+                'e7abbd532eee49541129e1d5481b74e2d6cc1da78bb2a2f8278085c0761f685a', -- kst
+                'edbfe3c4a0448812c9aa348cebb8794d700077677a096692ac9285a659840556', -- ulf
+                '3a5dd9cbdfc6b1a858a11c32354b35fd09c37ea2ef1297109d1332c82950508a', -- haudrauf
+                '69a9e9ad28d86d1619ae596b5f7ba1be3cc42f877d673757a9daf1f0ee7231d0', -- grotax
+                },
+        },
     },
   },
 }
diff --git a/site.mk b/site.mk
@@ -28,30 +28,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 # add offline ssid only if the target has wifi device
-ifeq ($(GLUON_TARGET),ar71xx-generic)
-GLUON_SITE_PACKAGES += \
-	gluon-ssid-changer
-endif
-
-ifeq ($(GLUON_TARGET),ar71xx-mikrotik)
-GLUON_SITE_PACKAGES += \
-	gluon-ssid-changer
-endif
-
-ifeq ($(GLUON_TARGET),ar71xx-nand)
-GLUON_SITE_PACKAGES += \
-	gluon-ssid-changer
-endif
-
-ifeq ($(GLUON_TARGET),mpc85xx-generic)
-GLUON_SITE_PACKAGES += \
-	gluon-ssid-changer
-endif
-
-ifeq ($(GLUON_TARGET),ramips-rt305x)
-GLUON_SITE_PACKAGES += \
-	gluon-ssid-changer
-endif
+# removed
 
 # add addition network drivers and usb stuff only to targes where disk space does not matter.
 ifeq ($(GLUON_TARGET),x86-generic)
@@ -80,7 +57,6 @@ endif
 
 ifeq ($(GLUON_TARGET),brcm2708-bcm2708)
 GLUON_SITE_PACKAGES += \
-        gluon-ssid-changer \
         kmod-usb-core \
         kmod-usb2 \
         kmod-usb-hid \
@@ -91,7 +67,6 @@ endif
 
 ifeq ($(GLUON_TARGET),brcm2708-bcm2709)
 GLUON_SITE_PACKAGES += \
-        gluon-ssid-changer \
         kmod-usb-core \
         kmod-usb2 \
         kmod-usb-hid \
@@ -102,7 +77,6 @@ endif
 
 ifeq ($(GLUON_TARGET),sunxi)
 GLUON_SITE_PACKAGES += \
-        gluon-ssid-changer \
         kmod-usb-core \
         kmod-usb2 \
         kmod-usb-hid \
@@ -111,12 +85,12 @@ GLUON_SITE_PACKAGES += \
         kmod-usb-net-dm9601-ether
 endif
 
-DEFAULT_GLUON_RELEASE := 2016.2.6+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 2016.2.7
 
 #GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-GLUON_RELEASE ?= 2016.2.6
+GLUON_RELEASE ?= 2016.2.7
 
-GLUON_BRANCH ?= experimental
+GLUON_BRANCH ?= stable
 #GLUON_BRANCH ?= beta
 #GLUON_BRANCH ?= stable
 export GLUON_BRANCH