Bugfix

2015-06-02 11:28:04 +02:00 · 2015-06-02 11:28:04 +02:00 · 0975d2cbec
commit 0975d2cbec
parent a07e987cb6
1 changed files with 121 additions and 52 deletions
--- a/site.conf
+++ b/site.conf
@ -1,47 +1,3 @@
-Skip to content
-This repository  
-Explore
-Gist
-Blog
-Help
-@stebifan stebifan
- 
- Unwatch 3
-  Star 0
- Fork 2Freifunk-Troisdorf/site
-site/    or cancel
-     
- Edit file   Preview changes
-
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
 {
    hostname_prefix = 'tdf',
    site_name = 'Freifunk Troisdorf',
@ -71,12 +27,125 @@ site/    or cancel
        mesh_bssid = '02:74:05:d0:4f:00',
        mesh_mcast_rate = 12000,
    },
-@stebifan
-Commit changes
+    next_node = {
+        ip4 = '10.188.0.1',
+        ip6 = 'fda0:747e:ab29:7405::1',
+        mac = '04:74:05:d0:4f:aa',
+    },
+    fastd_mesh_vpn = {
+        methods = {
+            'salsa2012+umac',
+            'salsa2012+gmac'
+        },
+        mtu = 1406,
+        groups = {
+            backbone = {
+                limit = 2,
+            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'},
+                },
+                gateway2 = {
+                    key = '9154293d90bb907a647338585da4ddf283e534a948a0bb73ca604391fdd4aa0b',
+                    remotes = {'"gateway2.freifunk-troisdorf.de" port 53840'},
+                },
+            },
+        },
+    },
+    },
+autoupdater = {
+        enabled = true,
+        branch = 'stable',
+        branches = {
+            stable = {
+                name = 'stable',
+                mirrors = {
+                    'http://update1.infra.fftdf/stable/sysupgrade',
+                    'http://update2.infra.fftdf/stable/sysupgrade',
+                    'http://update3.infra.fftdf/stable/sysupgrade'
+                },
+                probability = 0.08,
+                good_signatures = 2,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka

-
-  Commit directly to the v2015.1 branch
-  Create a new branch for this commit and start a pull request. Learn more about pull requests.
-Commit changes  Cancel
-Status API Training Shop Blog About
-© 2015 GitHub, Inc. Terms Privacy Security Contact
+                },
+            },
+            beta = {
+                name = 'beta',
+                mirrors = {
+                    'http://update1.infra.fftdf/beta/sysupgrade',
+                    'http://update2.infra.fftdf/beta/sysupgrade',
+                    'http://update3.infra.fftdf/beta/sysupgrade'
+                },
+                probability = 0.08,
+                good_signatures = 1,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
+                },
+            },
+            experimental = {
+                name = 'experimental',
+                mirrors = {
+                    'http://update1.infra.fftdf/experimental/sysupgrade',
+                    'http://update2.infra.fftdf/experimental/sysupgrade',
+                    'http://update3.infra.fftdf/experimental/sysupgrade'
+                },
+                probability = 1.00,
+                good_signatures = 1,
+                pubkeys = {
+                    '2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
+                    '98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
+                    '40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
+                },
+            },
+        },
+    },
+roles = {
+  default = 'node',
+  list = {
+    node = 'Normal Node',
+    test = 'Test Node',
+    backbone = 'Backbone Node',
+    service = 'Service Node',
+        },
+    },
+    simple_tc = {
+        mesh_vpn = {
+            ifname = 'mesh-vpn',
+            enabled = false,
+            limit_egress = 300,
+            limit_ingress = 5000,
+        },
+    },
+    legacy = {
+        version_files = {'/etc/.freifunk_version_keep', '/etc/.fftro_version_keep'},
+        old_files = {'/etc/config/config_mode', '/etc/config/fftro', '/etc/config/freifunk'},
+        config_mode_configs = {'config_mode', 'fftro', 'freifunk'},
+        fastd_configs = {'fftro_mesh_vpn', 'mesh_vpn'},
+        mesh_ifname = 'freifunk',
+        tc_configs = {'fftro', 'freifunk'},
+        wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
+    },
+    }