Changes for new partition 'welcome'

site.conf

@@ -1,25 +1,25 @@
 {
-  hostname_prefix = '',
+  hostname_prefix = 'welcome',
-  site_name = 'Freifunk München',
+  site_name = 'Freifunk München Welcome',
   site_code = 'ffmuc',
   opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-  prefix4 = '10.80.0.0/16',
+  prefix4 = '10.80.64.0/16',
-  prefix6 = 'fdef:ffc0:4fff::/64',
+  prefix6 = 'fdef:ffc0:4fff:1:/64',
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
 
-  mesh_on_wan = false,
+  mesh_on_wan = true,
 
   regdom = 'DE',
 
   wifi24 = {
     ssid = 'muenchen.freifunk.net',
     channel = 6,
-    htmode = 'HT20',
+    htmode = 'HT40',
-    mesh_ssid = 'mesh.ffmuc',
+    mesh_ssid = 'mesh.ffmuc.welcome',
-    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_bssid = '02:0E:8E:1E:61:18',
     mesh_mcast_rate = 12000,
   },
 
@@ -27,14 +27,14 @@
     ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc',
+    mesh_ssid = 'mesh.ffmuc.welcome',
-    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_bssid = '02:0E:8E:1E:61:18',
     mesh_mcast_rate = 12000,
   },
 
   next_node = {
-    ip4 = '10.80.0.1',
+    ip4 = '10.80.64.1',
-    ip6 = 'fdef:ffc0:4fff::1',
+    ip6 = 'fdef:ffc0:4fff:1::1',
     mac = '16:41:95:40:f7:dc',
   },
 
@@ -45,74 +45,32 @@
       backbone = {
       limit = 1,
         peers = {
-          gw03_10000 = {
+          gwf01 = {
-            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+            key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
             remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10000',
+              'ipv4 "gwf01.ffmuc.net" port 11000',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwf01.freifunk-muenchen.de" port 11000',
             },
           },
-          gw03_10002 = {
+          gwf02 = {
-            key = '0c76609762e99e278f2112a09046970b9025aa768d0c30c27242491453579fe7',
+            key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
             remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10002',
+              'ipv4 "gwf02.ffmuc.net" port 11000',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10002',
+              'ipv4 "gwf02.freifunk-muenchen.de" port 11000',
             },
           },
-          gw04_10000 = {
+          gwf03 = {
-            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+            key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
             remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10000',
+              'ipv4 "gwf03.ffmuc.net" port 11000',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwf03.freifunk-muenchen.de" port 11000',
             },
           },
-          gw04_10002 = {
+          gwf04 = {
-            key = 'e6f0f50d2fa155a078316b6e3acad4595adcf453b959f85f20070c68df328065',
+            key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
             remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10002',
+              'ipv4 "gwf04.ffmuc.net" port 11000',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10002',
+              'ipv4 "gwf04.freifunk-muenchen.de" port 11000',
-            },
-          },
-          gw05 = {
-            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-            remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10000',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw06 = {
-            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
-            remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10000',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw07 = {
-            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
-            remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10000',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw08 = {
-            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
-            remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10000',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw09 = {
-            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-            remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10000',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw10 = {
-            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
-            remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10000',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
             },
           },
         },
@@ -127,8 +85,8 @@
       stable = {
         name = 'stable',
         mirrors = {
-          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://firmware.ffmuc.net/welcome/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/welcome/stable/sysupgrade/',
         },
         probability = 0.1,
         good_signatures = 2,
@@ -142,8 +100,8 @@
       experimental = {
         name = 'experimental',
         mirrors = {
-          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://firmware.ffmuc.net/welcome/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/welcome/experimental/sysupgrade/',
         },
         probability = 0.5,
         good_signatures = 1,