From 4d1fdf95a7263429dc3261f309b02dd2ab207d5d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 5 Oct 2015 12:35:44 +0200
Subject: [PATCH] Remove extra site symlink

---
 extra/ffmuc.conf | 156 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 155 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 extra/ffmuc.conf

diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf
deleted file mode 120000
index 2873803..0000000
--- a/extra/ffmuc.conf
+++ /dev/null
@@ -1 +0,0 @@
-../site.conf
\ No newline at end of file
diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf
new file mode 100644
index 0000000..81c4667
--- /dev/null
+++ b/extra/ffmuc.conf
@@ -0,0 +1,155 @@
+{
+  hostname_prefix = '',
+  site_name = 'Freifunk München',
+  site_code = 'ffmuc',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  prefix4 = '10.80.32.0/19',
+  prefix6 = 'fdef:ffc0:4fff::/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,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc',
+    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_mcast_rate = 12000,
+  },
+
+  wifi5 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc',
+    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_mcast_rate = 12000,
+  },
+
+  next_node = {
+    ip4 = '10.80.32.1',
+    ip6 = 'fdef:ffc0:4fff::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1426,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gw03 = {
+            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+            remotes = {
+              'ipv4 "gw03.ffmuc.net" port 10000',
+              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw04 = {
+            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+            remotes = {
+              'ipv4 "gw04.ffmuc.net" port 10000',
+              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+            },
+          },
+          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',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et