Switch autoupdater URL back to main firmware repo path

Update site.conf

CHANGELOG.md

@@ -1,8 +1,5 @@
 # Freifunk München Firmware Changelog
 
-## v2015.6.2
- * Bugfix build for welcome version
-
 ## v2015.6.1
  * Added support of site selection in config mode
  * Switch autoupdater URL back to main firmware repo path

site.conf

@@ -1,11 +1,11 @@
 {
-  hostname_prefix = 'welcome',
-  site_name = 'Freifunk München Welcome',
-  site_code = 'ffmuc_welcome',
+  hostname_prefix = '',
+  site_name = 'Freifunk München Umland',
+  site_code = 'ffmuc_umland',
   opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-  prefix4 = '10.80.64.0/19',
-  prefix6 = 'fdef:ffc0:4fff:1::/64',
+  prefix4 = '10.80.96.0/19',
+  prefix6 = 'fdef:ffc0:4fff:2::/64',
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
@@ -18,8 +18,8 @@
     ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc.welcome',
-    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
     mesh_mcast_rate = 12000,
   },
 
@@ -27,14 +27,14 @@
     ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc.welcome',
-    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
     mesh_mcast_rate = 12000,
   },
 
   next_node = {
-    ip4 = '10.80.64.1',
-    ip6 = 'fdef:ffc0:4fff:1::1',
+    ip4 = '10.80.96.1',
+    ip6 = 'fdef:ffc0:4fff:2::1',
     mac = '16:41:95:40:f7:dc',
   },
 
@@ -45,32 +45,39 @@
       backbone = {
       limit = 1,
         peers = {
-          gwf01 = {
-            key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
+          gwu01 = {
+            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
             remotes = {
-              'ipv4 "gwf01.ffmuc.net" port 11000',
-              'ipv4 "gwf01.freifunk-muenchen.de" port 11000',
+              'ipv4 "gwu01.ffmuc.net" port 10010',
+              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
             },
           },
-          gwf02 = {
-            key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
+          gwu02 = {
+            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
             remotes = {
-              'ipv4 "gwf02.ffmuc.net" port 11000',
-              'ipv4 "gwf02.freifunk-muenchen.de" port 11001',
+              'ipv4 "gwu02.ffmuc.net" port 10011',
+              'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
             },
           },
-          gwf03 = {
-            key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
+          gwu03 = {
+            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
             remotes = {
-              'ipv4 "gwf03.ffmuc.net" port 11000',
-              'ipv4 "gwf03.freifunk-muenchen.de" port 11002',
+              'ipv4 "gwu03.ffmuc.net" port 10012',
+              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
             },
           },
-          gwf04 = {
-            key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
+          gwu04 = {
+            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
             remotes = {
-              'ipv4 "gwf04.ffmuc.net" port 11000',
-              'ipv4 "gwf04.freifunk-muenchen.de" port 11003',
+              'ipv4 "gwu04.ffmuc.net" port 10013',
+              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
+            },
+          },
+          gwu05 = {
+            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
+            remotes = {
+              'ipv4 "gwu05.ffmuc.net" port 10014',
+              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
             },
           },
         },