From 1203f45c94b1aeec94f57ca9fd3e1375c960f7bd Mon Sep 17 00:00:00 2001
From: stebifan <stefan@tro-mail.de>
Date: Tue, 2 Jun 2015 10:44:07 +0200
Subject: [PATCH] Bugfix Peer Groups

---
 site.conf | 72 +++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/site.conf b/site.conf
index 17001be..892336d 100644
--- a/site.conf
+++ b/site.conf
@@ -33,49 +33,47 @@
         mac = '04:74:05:d0:4f:aa',
     },
     fastd_mesh_vpn = {
-        methods = {'salsa2012+umac', 'salsa2012+gmac'},
+        methods = {
+            'salsa2012+umac',
+            'salsa2012+gmac'
+        },
         mtu = 1406,
         groups = {
-            backbone = {
-                limit = 2,
-                groups = {
-                    wupper = {
-                    limit = 1,
-                        peers = {
-                            wupper0 = {
-                                key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b',
-                                remotes = {'"wupper0.freifunk-troisdorf.de" port 53840'},
-                            },
-                            wupper1 = {
-                                key = '6eae041199ee627689bfa026afbd8a9ab299eca8aed4144321d098cffd62668e',
-                                remotes = {'"wupper1.freifunk-troisdorf.de" port 53840'},
-                            },
-                            wupper2 = {
-                                key = 'b7f319d59d8383ba813c3503416bca45f70852e4d207b1743bb6cdca1e30d9f5',
-                                remotes = {'"wupper2.freifunk-troisdorf.de" port 53840'},
-                            },
-                            wupper3 = {
-                                key = 'c8f3d1d10b0d6389e39c3c3cb08adfa3123e821fd5bfd6262d2161d80ee4b06c',
-                                emotes = {'"wupper3.freifunk-troisdorf.de" port 53840'},
-                            },
-                            wupper4 = {
-                                key = '5e7fa122990dbc34b8cae7ece2cd4ef919d3f8c23a674b7bbcf05bfebe6a6e8a',
-                                remotes = {'"wupper4.freifunk-troisdorf.de" port 53840'},
-                            },
-                        },
-                    },
-                troisdorf = {
+            wupper = {
                 limit = 1,
-                    peers = {
-                        gateway2 = {
-                            key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
-                            remotes = {'"gateway2.freifunk-troisdorf.de" port 53840'},
-                        },
+                peers = {
+                    wupper0 = {
+                        key = '7142f897f4e55d2c19207aa59db92ec54d7517cf558d5ecaef33689234952a4b',
+                        remotes = {'"wupper0.freifunk-troisdorf.de" port 53840'},
+                    },
+                    wupper1 = {
+                        key = '6eae041199ee627689bfa026afbd8a9ab299eca8aed4144321d098cffd62668e',
+                        remotes = {'"wupper1.freifunk-troisdorf.de" port 53840'},
+                    },
+                    wupper2 = {
+                            key = 'b7f319d59d8383ba813c3503416bca45f70852e4d207b1743bb6cdca1e30d9f5',
+                            remotes = {'"wupper2.freifunk-troisdorf.de" port 53840'},
+                    },
+                    wupper3 = {
+                        key = 'c8f3d1d10b0d6389e39c3c3cb08adfa3123e821fd5bfd6262d2161d80ee4b06c',
+                        remotes = {'"wupper3.freifunk-troisdorf.de" port 53840'},
+                    },
+                    wupper4 = {
+                        key = '5e7fa122990dbc34b8cae7ece2cd4ef919d3f8c23a674b7bbcf05bfebe6a6e8a',
+                        remotes = {'"wupper4.freifunk-troisdorf.de" port 53840'},
                     },
                 },
             },
-        },
-    },
+            troisdorf = {
+                limit = 1,
+                peers = {
+                    gateway2 = {
+                        key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
+                        remotes = {'"gateway2.freifunk-troisdorf.de" port 53840'},
+                        },
+                    },
+                }
+            },
     },
 autoupdater = {
         enabled = true,