From f15810b52a0848a6793408e2d745dd16254dd576 Mon Sep 17 00:00:00 2001
From: ohrensessel <git@ohrensessel.net>
Date: Fri, 2 Jan 2015 13:01:37 +0100
Subject: [PATCH 01/96] remove hamburg 31C3 gateway
thank you for a nice congress and a nice freifunk assembly
---
hosts/hamburg31 | 11 -----------
1 file changed, 11 deletions(-)
delete mode 100644 hosts/hamburg31
diff --git a/hosts/hamburg31 b/hosts/hamburg31
deleted file mode 100644
index 2498972..0000000
--- a/hosts/hamburg31
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = 31c3.icvpn.hamburg.freifunk.net
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAwxJL8dxTEgfM/oSOzZivDL2NxOtplh6yCusY+cbH5u+x1aRWhfbe
-ZBv37xYGXQq1Gx+SX9zASsj50AX/XK634+NQWCHVVcBtcB8VDMA3d4WAnDtvvdwA
-L/uZQzFuWzi60Y76LZZJXmvICxatHYO+1TUUdHyxnInLjVVFotKsmNRm5T4EwOoj
-US414QvjO3Z8Hdmv8N/mA4RsMfJ7udrIbf7Rbne0w+Tfy7qgeYu1knNYcTObSHSe
-JXf0byElmtlCXP/B+/gocvCFAXg87JVrVN8OxoZgF6GvH5GYOD/nz63uQ/SXc6P7
-qsIfCa/XW2J5Jgt7DIfjQImjII55udo7DwIDAQAB
------END RSA PUBLIC KEY-----
From e7766f20a1bfd75c8935c30f0806b2389f511c68 Mon Sep 17 00:00:00 2001
From: hhansen06 <hhansen06@googlemail.com>
Date: Sun, 11 Jan 2015 23:52:50 +0100
Subject: [PATCH 02/96] added Community FFDH
---
hosts/diepholz1 | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 hosts/diepholz1
diff --git a/hosts/diepholz1 b/hosts/diepholz1
new file mode 100644
index 0000000..10547c2
--- /dev/null
+++ b/hosts/diepholz1
@@ -0,0 +1,10 @@
+Address = gw1.freifunk-dh.de
+Port = 655
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA3SOeCXMYhCyoBXd4LhJDEdq8afDcdT2+kX+8Cnv5HHMWfKv0PodZ
+1zwPl04D3e7MJ+F73YXOIV6zAdEpwXMW6h15qg3r5vL+ZPKY/ywYnb3c1CIOe2C8
+2rJoo9ynjJJt3rbrSc2qOkKFcEfSZWPn2cs9IiaX/tgZaPwpc/KDjPQ5kQ9AwVJk
+2jMhuBHQClPUw/szHwkultrkRehQ7+H/lq7VMXdxfBHBh6Vtk6KX6N8S7NXYcKbG
+Gk52yzLnlmGLxqJbPBBg68o54EEPsS9HUe4oKRkhYoHduQu3OTL4oFZTTXqVmaxB
+JSXyXDFbJPMPNoSsC2F2D9bfPswIfH/efQIDAQAB
+-----END RSA PUBLIC KEY-----
\ No newline at end of file
From 3e10988aa6bcde320680664975a34d9855fc0b48 Mon Sep 17 00:00:00 2001
From: Kai 'wusel' Siering <wusel+src@uu.org>
Date: Tue, 13 Jan 2015 20:00:28 +0100
Subject: [PATCH 03/96] Adding Mueritz1
---
hosts/mueritz_bgp1 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/mueritz_bgp1
diff --git a/hosts/mueritz_bgp1 b/hosts/mueritz_bgp1
new file mode 100644
index 0000000..dd8b597
--- /dev/null
+++ b/hosts/mueritz_bgp1
@@ -0,0 +1,11 @@
+Address = gw05.4830.org
+Port = 655
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAuizkPDLiPvMxnom5i6RG0ijqT9tKmuAFWdMT8FIPoP+d4x0M+1WF
+F8tPZk6Si1t7AX9Cp4ZhPHbbwvSXb/P4Q2VLX2w0A9F67bZQFUBKCaGdRuFPXd2/
+aPr2mQQFB0agA5rkQgegRVbFhKhxGE3UMLhP2DYkfTSI7Yw0oyzGOnSK1Jga5Y9Z
+8W/sxPxj0rpAt/NFfl88qI9aiOYmOD8aFu+spQnNi9/K2yXVdYul0w7w2KAnCyjq
+QWZbNzxFT6Lnlr4YnpuN3Yd81eeThPbH9of2wdMKyJSL6cYM+zZxCeniscspWrRw
+3LPyinT/hEHLChkrQY507QQWXCM588yZeQIDAQAB
+-----END RSA PUBLIC KEY-----
From e7f03c384c8f62d2bc471cb867bc8a7926dcb205 Mon Sep 17 00:00:00 2001
From: Kai 'wusel' Siering <wusel+src@uu.org>
Date: Mon, 26 Jan 2015 01:32:35 +0100
Subject: [PATCH 04/96] New key
---
hosts/gueterslohbgp2 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hosts/gueterslohbgp2 b/hosts/gueterslohbgp2
index 5b1fae6..a508444 100644
--- a/hosts/gueterslohbgp2
+++ b/hosts/gueterslohbgp2
@@ -1,10 +1,10 @@
Address = bgp2.guetersloh.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAx3TChQ0jKU/VZOJAnAxFk8IGLowzvhmtAVZrli6JjXp2hyGS0hrC
-ZS/aZzQhpqeEmAVgqUJSOicIVT2hwyieyZXEM+fPgfEmD04ZDVjSFpjEPdJCp5iC
-rFU8saEg2c/MBnKAOl6YwjYUCADpjGpFrIvgGIv70OnFRzToQDAOZoW06Ka7OPnk
-XBAtpzamQpfKjjER5OPkRvj9Ne8KcUHo1vkJO/X4BkuFSOA2HQHYXdLKfPxcBijv
-XI+9imHtVCZzvU45XkUpOZ8GC8o4z2FszBjsh8skG2DoPckCe8Hz8S+Ajxl1xelG
-5wQ3SZ8gEj5NnP+OY/3OjUkJwsG/CAyAYQIDAQAB
+MIIBCgKCAQEAwNqFwx5UvkekzqCArb2BBFBqtdRbOsY5WlL58qXPVm6buVqZhy0R
+ZZ497YrX82L3K97sFZ/1jFa/YsY9n6E912Zcca5GxY7ln/wrkO8mSfvCq1KCUpv9
+/00cQxTf+AVlHvryWDupxPasO29wb6b5ftd3HXR1lG/eg3YXmXMAFnWr7wYnrFwW
+1YP9YW1cJRZw9AjQ7Y1X2ETa4JkcjCjY7R7hVoJFoVqjf5JLBpqGy/swETrQB0Ln
+ZpSRSrmfMhf1dIIYnYLoqH9og6ypl6vAqYAOwN9KIFTODK7uXW9ARVyor9I9R4cC
+cMtg3bB/QyS+GJDyvYCGJn/ZL6TrSOw7WwIDAQAB
-----END RSA PUBLIC KEY-----
From 4c453a1b945b5433ce1af4d0442f4357731fa4ff Mon Sep 17 00:00:00 2001
From: strehi <freifunk@inti.inka.de>
Date: Mon, 26 Jan 2015 13:33:28 +0100
Subject: [PATCH 05/96] Karlsruhe2 added
---
hosts/karlsruhe2 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 hosts/karlsruhe2
diff --git a/hosts/karlsruhe2 b/hosts/karlsruhe2
new file mode 100644
index 0000000..59500a6
--- /dev/null
+++ b/hosts/karlsruhe2
@@ -0,0 +1,15 @@
+Address = albufer1.ffka.net
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAv3w8au8y75sWMzfi1sRzOjI/f+7Gak0qqHcGAQGd+TCwF88OgGDk
+c7TUQJfUG1FcLSiEMKUSKyokFBU6qbzrnwxsK+/foEGrcde4CKaJ1/q+wxL1lRu0
+/12ZVIvr6rMHugjD7XfRbHaUoH1p6ki1+mpwRiLKgKimYxaKoTTJGzkR5Gkabu59
+J7zq6NhzDl+n4usI16Hd2rCtdvG5txDQJvnQTXS4oaidYMDbOulAK+FmDSwkPIcU
+uaGELGD1eMDKR6e/cp3DqTLG54GgmxamL1i44iGwOWfFGC+JfeNEcS/FgOzIhTrR
+a8SRnwJ7FnfqaOee0Ktht1iRmuhJQxtrgusi++WII77SC9jH1kZw2bqh60YbQVlh
+szNPfbpu/TRiqlduDJDmmJgXDG0J3eSvzLWT1D+qXG5Swk7R04VYLCh/oXHAiHol
+l/3D7423tcW51hq316if/9ncfXpKXcdQiEIjmhVt1vi7FQk+1lwmTOKXBAAXnZDb
+7zO2aY1p7YncAudL1CP3oQPazWQHW+2XmLvnOL5guBb/3LL/3CltwBUAz6zfm2Pj
+YKNiQJG5+YBZaPAIy+y4mhDbh9TIO3Zw0eNt4jinu7486iWstkjj+V8E7fWkTBZd
+t2kGBpR5xOVsd8ettZr5pDni9n/e/SJasizsqGjsQnPjWqEUj+wZKn8CAwEAAQ==
+-----END RSA PUBLIC KEY-----
From 61743d7acddd0cafdd65d9c6e787ec45c7d58f38 Mon Sep 17 00:00:00 2001
From: thomasDOTde <thomas@drewermann.org>
Date: Sun, 1 Feb 2015 02:06:50 +0100
Subject: [PATCH 06/96] added 103.freifunk-moehne.de
---
hosts/moehne103 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 hosts/moehne103
diff --git a/hosts/moehne103 b/hosts/moehne103
new file mode 100644
index 0000000..a07102e
--- /dev/null
+++ b/hosts/moehne103
@@ -0,0 +1,15 @@
+address = 103.freifunk-moehne.de
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAzBMf2LQ7pa12n6VwBMUhMlJ0OXq6QYpPjfJpzJM4mnZ5j4oecpuN
+Y1WO3FcbMuvU87eVNUUe+qetK1EuneqFadw4vILI5RNFYoWolqHqEDZmO2rLe9QK
+T/CGYcLUi0SAOlXhXtPOod6XY+wcYJC8bq/tZDp/kWUbrwPJ+pl/bIAjex8WddaV
+REJEayNvbgy5ehQ9+2JYHm1RSPfsz5UXD6hcgcKbQyqZZfvuL/r1WWQ+7gednVR9
+ZQwgenLCVBZRDs5K7rH0oyv3VrY3SYJijoBTuTLcLiso9s7jJn9gsbv3DtyqkRXD
+nhxGGFAfpMk1i4lcf40l9xkoCjiajRvcpCHuXUddl1TNVUXUd6KcciRHLLlqM/hr
+Od0QzuW3PGvWHqTPinSvtkwIh+7t2LUlDsH1QfB2FOHppYbjci3YpwnLWJUlzuAh
+mAJRM+jBiofKlWnJiU3nnncs58+bGgqhBO8b7F2pjoT5j9qqvOzgZnYAN+g+kvWJ
+Abq0eWodCcvLmcbiycVP2HzI/A4lhRGjjvfFLRmLO7R6ZO5iXuBoM6W4AKwoxJrw
+SBpf04nphfWBsez1QW6YqxxsTEDI1+y43VQmu1DVxhrQwexldRaMNLpyNVDZzZCv
+hmPpPDJLfdAlr3ld78aBZHVAB5mCOygPuNHbtxnTc3xMWW+zDVeBQvcCAwEAAQ==
+-----END RSA PUBLIC KEY-----
+
From 6a65b62e379107d78a36d414b530a95df5db5e82 Mon Sep 17 00:00:00 2001
From: thomasDOTde <thomas@drewermann.org>
Date: Tue, 3 Feb 2015 12:18:59 +0100
Subject: [PATCH 07/96] added 003.freifunk-moehne.de
---
hosts/moehne003 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 hosts/moehne003
diff --git a/hosts/moehne003 b/hosts/moehne003
new file mode 100644
index 0000000..da668eb
--- /dev/null
+++ b/hosts/moehne003
@@ -0,0 +1,15 @@
+address = 003.freifunk-moehne.de
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAt9L7wOZhCIIoRZSFE+AiQ6evhH+I7z2duDULC3COb8EorKZzaFse
+cTCfaOdZ6+cbraqFOiwAzigSf6CoaE8XdnSsWcowQGfESL+CJopoC3Be8h3Cz7ct
+mWz+XmuRl6hHOKqGKxWRxihHQs5zdhF3k/iloWbBqozgKfqqaD8qkeKF32Fn14Ze
+UUm7hWQgicyemGGZhBE3dluV9svN/XmAFty2r05y03wnHB37jc9RdegW3TcNSO4m
+Y9K/q7pXQiA9TwoSpOEv+tKzWoVPf6Rp2ZXZb64vgl+tBnjvT8URL+EiYDHz0LTa
+EuhHuK8pulXOQ5rZ1WmzuQDHBZWVMOLsiAepNd/zMXVpbp5CHpMW0zAbCDwtSdIv
+qKODY28jWPvIxKK+7RyVaIehGrtu38zkelLYBaGuDUI6WLPkF8nM1BuJj69e47cF
+NccaZah1wDIHk7WCCSUs9vPCb+rsNoDJUMm0/2dYG4dbDKJVCve6aYfEddlOxlTW
+7wtjv592H9KGmf7+xMrcOt9Wvc1eDVvSrf6Ld9nv5Myd03YGYJau5JPPoyDVfCnI
+MI8OMdNbEggXBSFFvlkU63JLgJGecuzJsVmb1MJjOMTuzOTl3WUvME8mtCdzZA53
+LrQCHKBfQsK4V5MNURxvmMrLytUfEzjjMsP65HCiaEz9GCsNliNvuCcCAwEAAQ==
+-----END RSA PUBLIC KEY-----
+
From 5dbe872abfc1b09c51e453c7eacf5fa01802b9f5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Fri, 6 Feb 2015 06:15:17 +0100
Subject: [PATCH 08/96] Add simple check script: - check dns forward lookups -
check reachability via icmpv4/icmpv6 echo request
---
scripts/check | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 131 insertions(+)
create mode 100644 scripts/check
diff --git a/scripts/check b/scripts/check
new file mode 100644
index 0000000..4172ecc
--- /dev/null
+++ b/scripts/check
@@ -0,0 +1,131 @@
+#!/usr/bin/env python
+
+import sys
+import os
+import socket
+import subprocess
+from optparse import OptionParser
+
+
+def error(*arg):
+ print(*arg, file=sys.stderr)
+
+
+def check_host_lookup(hostname, port):
+ try:
+ return socket.getaddrinfo(hostname, port)
+ except Exception as e:
+ error("DNS Lookup for {hostname} failed".format(hostname=hostname))
+ return []
+
+
+def check_reachability(host, family):
+ if family is socket.AddressFamily.AF_INET:
+ process_name = 'ping'
+ else:
+ process_name = 'ping6'
+ child = subprocess.Popen([process_name, host, '-c', '1', '-W', '5'],
+ stdout=subprocess.PIPE)
+ child.communicate()
+ if child.returncode:
+ error("Host {host} is unreachable".format(host=host))
+ return 0 if child.returncode == 0 else 1
+
+
+def get_hosts_data(srcdir):
+ for fname in sorted(list(set(os.listdir(srcdir)))):
+ if fname.startswith("."):
+ continue
+
+ fpath = os.path.join(srcdir, fname)
+ if os.path.isfile(fpath):
+ with open(fpath) as f:
+ ignore_key = False
+ addresses = []
+ port = 655 # tinc default port
+
+ for line in f.readlines():
+
+ if '-----BEGIN RSA PUBLIC KEY-----' in line:
+ ignore_key = True
+ elif '-----END RSA PUBLIC KEY-----' in line:
+ ignore_key = False
+
+ if line.startswith("#") or ignore_key:
+ continue
+
+ chunks = line.split("=")
+ if len(chunks) == 2:
+ import pdb
+ # pdb.set_trace()
+ (k, v) = (x.strip().lower() for x in chunks)
+
+ if k == "port":
+ try:
+ port = int(v)
+ except ValueError:
+ error("non-integer default port given")
+ elif k == "address":
+ if " " in v:
+ parts = v.split(' ')
+ if len(parts) != 2:
+ error("unknown address format")
+ try:
+ int(parts[1])
+ addresses.append(parts)
+ except ValueError:
+ error("non-integer port given")
+ else:
+ addresses.append((v, None))
+ elif k in ('ecdsapublickey'):
+ continue
+ else:
+ error("unknown key {key} with value {val}"
+ .format(key=k, val=v))
+
+ # set explicit port for address/port pairs
+ for i, addr in enumerate(addresses):
+ if addr[1] is None:
+ item = (addr[0], port)
+ addresses[i] = item
+
+ yield(dict(community=fname, addresses=addresses))
+
+
+def do_checks(srcdir):
+ errcnt = 0
+ for host in get_hosts_data(srcdir):
+ print("Checking {community}".format(community=host['community']))
+ for address in host['addresses']:
+ host, port = address
+
+ # dns lookup
+ records = check_host_lookup(host, port)
+ if not records:
+ errcnt += 1
+ else:
+ for record in records:
+ if record[1] is not socket.SocketType.SOCK_DGRAM:
+ # we get SOCK_STREAM, SOCK_DGRAM and SOCK_RAW
+ # for every IP/Port pair, lets just pick one
+ # to have unique ip addresses
+ continue
+ errcnt += check_reachability(record[4][0], record[0])
+
+ print("{errcnt} errors".format(errcnt=errcnt))
+
+ return 0 if errcnt == 0 else 1
+
+
+if __name__ == "__main__":
+ parser = OptionParser()
+ parser.add_option("-s", "--sourcedir", dest="src",
+ help="Location of tinc host files. Default: ../hosts",
+ metavar="DIR",
+ default="../hosts/")
+
+ (options, args) = parser.parse_args()
+
+ ret = do_checks(options.src)
+
+ sys.exit(ret)
From be42ec4b68f4a96ad9540e215542683adfe877f3 Mon Sep 17 00:00:00 2001
From: hexa- <mweinelt@gmail.com>
Date: Fri, 6 Feb 2015 06:21:52 +0100
Subject: [PATCH 09/96] Add .travis.yml, fix executable flag on check script
and remove pdb from imports
---
.travis.yml | 5 +++++
scripts/check | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 .travis.yml
mode change 100644 => 100755 scripts/check
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..9042af1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+sudo: false
+language: python
+python:
+ - "3.4"
+script: scripts/check
diff --git a/scripts/check b/scripts/check
old mode 100644
new mode 100755
index 4172ecc..aad8271
--- a/scripts/check
+++ b/scripts/check
@@ -56,8 +56,6 @@ def get_hosts_data(srcdir):
chunks = line.split("=")
if len(chunks) == 2:
- import pdb
- # pdb.set_trace()
(k, v) = (x.strip().lower() for x in chunks)
if k == "port":
From ea4c50f9e2b6a7050c77ff5cba0512e8cde0fc81 Mon Sep 17 00:00:00 2001
From: hexa- <mweinelt@gmail.com>
Date: Fri, 6 Feb 2015 06:25:23 +0100
Subject: [PATCH 10/96] travis: fix hosts path
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 9042af1..fb0abc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,4 @@ sudo: false
language: python
python:
- "3.4"
-script: scripts/check
+script: scripts/check -s ./hosts/
From 6b3a7fd55495c780f598160d28922fafeb6f5611 Mon Sep 17 00:00:00 2001
From: hexa- <mweinelt@gmail.com>
Date: Fri, 6 Feb 2015 06:28:54 +0100
Subject: [PATCH 11/96] travis: fix iputils-ping dependency
---
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fb0abc5..be02140 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
-sudo: false
language: python
-python:
- - "3.4"
+python: "3.4"
+
+before_install: sudo apt-get install iputils-ping
script: scripts/check -s ./hosts/
From 14b3a2910d226573a1bc3c0e35250bd4ae0e6776 Mon Sep 17 00:00:00 2001
From: ohrensessel <git@ohrensessel.net>
Date: Fri, 6 Feb 2015 19:17:02 +0100
Subject: [PATCH 12/96] added hamburg01
---
hosts/hamburg01 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/hamburg01
diff --git a/hosts/hamburg01 b/hosts/hamburg01
new file mode 100644
index 0000000..4e6e83d
--- /dev/null
+++ b/hosts/hamburg01
@@ -0,0 +1,11 @@
+Address = 01.icvpn.hamburg.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA3IbMWLjnM3S4HsFfKvhJdg9TYRPnzxRyL2CaL5KtcCTu8mMMOeCX
+arfhaM0l7l/hr2/TrpjDH3NO+lT0mn9cwl1Jlq3bkNXiBghf+tgGJAr29DLm0teB
+bvxy5YgL4qbWknNvqDRuLr7IFn0bScd8twN9mLeXzAmRCl43zzLMoYIf1A67Bt3H
+pZ6MoIVF9ziw9E4s0cdaRx4S6Ok3h6ochCfoNAUAJhJvodOdjW9++Ffy+LLayBIZ
+S21vezhhcb7fJ2qSO6x42Kp3FBaEY8zpOVdtPRX171xTUIv0vxYfRGsaOsT0biQc
+EGCG3ch2HiwR7TDe4gpe7XV7+QpUY1dR/wIDAQAB
+-----END RSA PUBLIC KEY-----
From fd06115a8b6c4c8a02182450dec48a950091ed7b Mon Sep 17 00:00:00 2001
From: suicider <suicider@gmx.de>
Date: Fri, 6 Feb 2015 21:47:58 +0100
Subject: [PATCH 13/96] Create erfurt2
---
hosts/erfurt2 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/erfurt2
diff --git a/hosts/erfurt2 b/hosts/erfurt2
new file mode 100644
index 0000000..5313d12
--- /dev/null
+++ b/hosts/erfurt2
@@ -0,0 +1,11 @@
+Adress = ffef.securegate.eu
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA0R+JEwwaxHJZsTlxTjpwDIjrSvbG6yCkeGO/zablrIdnoctZHgNQ
+vcDvuSWeTThBvk7FVuOkgVbpcqTnDNzBNetV1SzpnQTG3yWJcADZtkt7oyEhkvV0
++fJN4eALaOJT1d1PVROcLyCVjBIP5m+d9rImLRQK0tzQnLWofuqDLxzYm8UjK2Df
+hZ4cHQNi0r8EPzQPzLjcz3YmYO6iJ1s27F6iXd16uBCoAX2y4QdSauHQiijah5bf
+laM3ZD8ry9Sgrxngz169ybp3yB7l37IPWhVRHy+OISY4z2G5IMEnwkeS+P8eM36X
+ZG//Jc/joqqHszKLUAL1zpfNVqygHs06fwIDAQAB
+-----END RSA PUBLIC KEY-----
From 6eca4fa2bf5f6692f575f688a97c53b255296952 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Fri, 6 Feb 2015 22:54:16 +0100
Subject: [PATCH 14/96] erfurt2: fix address key typo
---
hosts/erfurt2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/erfurt2 b/hosts/erfurt2
index 5313d12..06a2a65 100644
--- a/hosts/erfurt2
+++ b/hosts/erfurt2
@@ -1,4 +1,4 @@
-Adress = ffef.securegate.eu
+Address = ffef.securegate.eu
Port = 656
-----BEGIN RSA PUBLIC KEY-----
From d797bf27a3cfdb095b55a66572f19b254dbc4be1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Sat, 7 Feb 2015 01:27:51 +0100
Subject: [PATCH 15/96] Disable unreachable/unresolvable peers Commenting them
out enables them to still be able to connect to the network, if they come
back at some point. (cp. 954cf0da5aa8af1b6e1f32df4a57dccc078b2034)
Details will follow on the icvpn mailing list.
---
hosts/augsburg1 | 2 +-
hosts/augsburg2 | 2 +-
hosts/bayreuth1 | 2 +-
hosts/ffhallevpn1 | 2 +-
hosts/franken2 | 4 ++--
hosts/franken3 | 4 ++--
hosts/freiburg1 | 2 +-
hosts/halle1 | 2 +-
hosts/hamburg02 | 4 ++--
hosts/kiel3 | 2 +-
hosts/koeln1 | 4 ++--
hosts/leipzig1 | 2 +-
hosts/ljubljana1 | 2 +-
hosts/magdeburg2 | 4 ++--
14 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/hosts/augsburg1 b/hosts/augsburg1
index 3550946..dd08886 100644
--- a/hosts/augsburg1
+++ b/hosts/augsburg1
@@ -1,5 +1,5 @@
Address = augsburg1.icvpn.augsburg.freifunk.net
-Address = 109.163.229.249
+# Address = 109.163.229.249
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALVQaY0axASCewZdfMPbxUBwphhoDHKzm0SvpietNy0gy+43Jb+N/Cs+
d9l9HlAS2ngrCAahVm/GRA3iYHH2i5JdZnzxPFKdkefcZFz7x0ZDaqeqpb2YLWFs
diff --git a/hosts/augsburg2 b/hosts/augsburg2
index ea73a25..4e71c79 100644
--- a/hosts/augsburg2
+++ b/hosts/augsburg2
@@ -1,4 +1,4 @@
-Address = augsburg2.icvpn.augsburg.freifunk.net
+# Address = augsburg2.icvpn.augsburg.freifunk.net
Address = augsburg2.icvpn.freifunk-augsburg.de
-----BEGIN RSA PUBLIC KEY-----
diff --git a/hosts/bayreuth1 b/hosts/bayreuth1
index 8930844..dd3c88f 100644
--- a/hosts/bayreuth1
+++ b/hosts/bayreuth1
@@ -1,4 +1,4 @@
-Address = freifunk-bt.criede.de
+# Address = freifunk-bt.criede.de
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAppgeP431r3K4cgy9s1XUB/+SEb9F64Y9q34jxjwRssIaFx+mtukr
JDLFtRNNTi7ao+kL3s1OBhavCeKwYSFAlaQnIm7fLwKwhJiIZwnKVM26SJPUwPfP
diff --git a/hosts/ffhallevpn1 b/hosts/ffhallevpn1
index 56f0b31..2d3728f 100644
--- a/hosts/ffhallevpn1
+++ b/hosts/ffhallevpn1
@@ -1,5 +1,5 @@
Address = vpn1.freifunk-halle.de
-Address = 88.198.51.136
+# Address = 88.198.51.136
Port = 655
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALF/Wu4pe+f3dHeLYApHxUnOGUBzpNREUet6nDp80uWT/dph7h6Yqtz2
diff --git a/hosts/franken2 b/hosts/franken2
index 8767bcb..7a64878 100644
--- a/hosts/franken2
+++ b/hosts/franken2
@@ -1,5 +1,5 @@
-Address = gw2.fffranken.de
-Port = 656
+# Address = gw2.fffranken.de
+# Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAOvt5phPFC+/KUvmGWJdNfIoPWuHfJb0na25VteGQDUMn0krudoIJQFb
snELlAl5emnNbH7W5NWGKfjl7fMRC8RJ7r9eb1/jjsRlDK6aRnN8hHzcCa45PCeI
diff --git a/hosts/franken3 b/hosts/franken3
index 2b22447..00c11e8 100644
--- a/hosts/franken3
+++ b/hosts/franken3
@@ -1,5 +1,5 @@
-Address = vpn3.fffranken.de
-Port = 657
+# Address = vpn3.fffranken.de
+# Port = 657
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAPIkkqmdnJi3Y+cGKslf0t+swE+7rtfRQTStW29MP62L6Sn0lxb5MufU
LRtR0UW31SWQ03HGuUe51e16ppxZ3V1AFQvoLAwxwDD6VvBk4n+XEiupWPt+0XSd
diff --git a/hosts/freiburg1 b/hosts/freiburg1
index e352511..d88b910 100644
--- a/hosts/freiburg1
+++ b/hosts/freiburg1
@@ -1,4 +1,4 @@
-Address = port-87-193-156-225.static.qsc.de
+# Address = port-87-193-156-225.static.qsc.de
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALo3VfMiPxK5lxWOYqoCZavMp8Lo4HYTmhLR6w3dHDJTI+UKTNDOf3Tc
reO0q+K85uopAtuu9yEshMxapvmijmEO9YsD+XinLNvnwNxx7qSaVQrPFTa4MutK
diff --git a/hosts/halle1 b/hosts/halle1
index e8e04c2..0cb00eb 100644
--- a/hosts/halle1
+++ b/hosts/halle1
@@ -1,4 +1,4 @@
-Address = ffvpn.3dfxatwork.de
+# Address = ffvpn.3dfxatwork.de
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsYzXhlTKxR7YBUXHY0JscmtNbrFzZzviVzIhpuml499rh8TVhjMU
ozyjbaPhSUy+9RY4F1WpRmDi3lyDx7eT0viRlOkFG8huApXEgGLQgah0M/pfwkc1
diff --git a/hosts/hamburg02 b/hosts/hamburg02
index b52d8c1..b282957 100644
--- a/hosts/hamburg02
+++ b/hosts/hamburg02
@@ -1,5 +1,5 @@
-Address = 02.icvpn.hamburg.freifunk.net
-Port = 656
+# Address = 02.icvpn.hamburg.freifunk.net
+# Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEApyg+KLP9XfIwOIgBHjbGgt0l5ve+/O1Mec3ed/d0q6Bh+oTkJxOn
diff --git a/hosts/kiel3 b/hosts/kiel3
index 67a2736..3c83829 100644
--- a/hosts/kiel3
+++ b/hosts/kiel3
@@ -1,4 +1,4 @@
-Address=vpn3.freifunk.in-kiel.de
+# Address=vpn3.freifunk.in-kiel.de
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT
3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5
diff --git a/hosts/koeln1 b/hosts/koeln1
index 2c6de0e..b695e20 100644
--- a/hosts/koeln1
+++ b/hosts/koeln1
@@ -1,5 +1,5 @@
-Address = fastd3.kbu.freifunk.net
-Port = 656
+# Address = fastd3.kbu.freifunk.net
+# Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEAwzH7Z0W0yIDp80G8sHpaxez7GXL3Lql7DAdJkrNf6KEzZAsZ7usn
diff --git a/hosts/leipzig1 b/hosts/leipzig1
index 7163162..4f25546 100644
--- a/hosts/leipzig1
+++ b/hosts/leipzig1
@@ -1,4 +1,4 @@
-Address = vpn1.leipzig.freifunk.net
+# Address = vpn1.leipzig.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAKL7eWHmD2Rn6IP7JlSWtkphokN785g8nccBmfcjbwEwiZv+EFaVoid/
0dPfvHaX0GaQGOhpef3PVHEbIMuU8dD9+7WbXO3+hUSIAfHoIdGK7n8qFtzTpzqn
diff --git a/hosts/ljubljana1 b/hosts/ljubljana1
index ef99e59..c8dda7d 100644
--- a/hosts/ljubljana1
+++ b/hosts/ljubljana1
@@ -1,4 +1,4 @@
-address = gw.kiberpipa.net
+# address = gw.kiberpipa.net
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAL4X76pBCF0b/z45rFPbgTrKpISle9MbLqvq3tDc2fTERowis0aBTTuK
mfVIQkF3W+8JMcjQdez5tQWKHnfpz4PmdSC4Dmxolgk/d9b7HNQTP8MCmCLzf+D7
diff --git a/hosts/magdeburg2 b/hosts/magdeburg2
index d2de335..6f2b7e9 100644
--- a/hosts/magdeburg2
+++ b/hosts/magdeburg2
@@ -1,5 +1,5 @@
-Address = 2.icvpn.md.freifunk.net
-Port = 656
+# Address = 2.icvpn.md.freifunk.net
+# Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA6v9HoQhGnAaWsSofuT4gplTOBhzmDz23wdQeWkVKM2tY7WCA1KNO
From 19b11aed548790e7db2078eb5606404619468a18 Mon Sep 17 00:00:00 2001
From: Manuel Munz <munz@comuno.net>
Date: Tue, 10 Feb 2015 23:43:04 +0100
Subject: [PATCH 16/96] remove static ip address
---
hosts/augsburg1 | 1 -
1 file changed, 1 deletion(-)
diff --git a/hosts/augsburg1 b/hosts/augsburg1
index dd08886..2645f91 100644
--- a/hosts/augsburg1
+++ b/hosts/augsburg1
@@ -1,5 +1,4 @@
Address = augsburg1.icvpn.augsburg.freifunk.net
-# Address = 109.163.229.249
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALVQaY0axASCewZdfMPbxUBwphhoDHKzm0SvpietNy0gy+43Jb+N/Cs+
d9l9HlAS2ngrCAahVm/GRA3iYHH2i5JdZnzxPFKdkefcZFz7x0ZDaqeqpb2YLWFs
From 423c038a49d18dc8db6212a11e4919b1922e7f54 Mon Sep 17 00:00:00 2001
From: hexa- <mweinelt@gmail.com>
Date: Thu, 12 Feb 2015 18:12:29 +0100
Subject: [PATCH 17/96] Housekeeping: Remove hosts that were not updated after
being disabled in 2014/08 and are still unreachable
---
hosts/Treuenbrietzen | 6 ------
hosts/badzwischenhahn1 | 7 -------
hosts/castrop1 | 10 ----------
hosts/hannover1 | 6 ------
hosts/koblenz1 | 9 ---------
hosts/ljubljana2 | 6 ------
hosts/schwarzach1 | 10 ----------
7 files changed, 54 deletions(-)
delete mode 100644 hosts/Treuenbrietzen
delete mode 100644 hosts/badzwischenhahn1
delete mode 100644 hosts/castrop1
delete mode 100644 hosts/hannover1
delete mode 100644 hosts/koblenz1
delete mode 100644 hosts/ljubljana2
delete mode 100644 hosts/schwarzach1
diff --git a/hosts/Treuenbrietzen b/hosts/Treuenbrietzen
deleted file mode 100644
index 3bc18a0..0000000
--- a/hosts/Treuenbrietzen
+++ /dev/null
@@ -1,6 +0,0 @@
-#Address = shonyt.mine.nu
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBANbR3LhhWFNt9ak//ZTReEuNQHjibgTAM+cNTDwLevudrP3y9htxTzgF
-UZDHnkbDqwrYNjnuaMLIik7ljj5aKQd+fXmv3S+sFvvaPnm+e7Fpt+r/ReTnS6su
-iOdmQ7XgC/b6r5ISjGhSheHcVSNMmbDWwYISSpDTu9S5qcUAkp1jAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/badzwischenhahn1 b/hosts/badzwischenhahn1
deleted file mode 100644
index b5ae63c..0000000
--- a/hosts/badzwischenhahn1
+++ /dev/null
@@ -1,7 +0,0 @@
-#Address = ffbz.ath.cx
-#Port = 655
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAMlCF8Yj3adfH6Mssc7J59CMIzO4ZTa4meHXDaGWHXzGIMnUWRUlLIfp
-7sa/uJ4U9iQU3ZEwv1cPWweDvWrG1HNL+oJEVv7xQWcBXaYnm0le305qom0E0U5U
-cMt+yNZWTh2KfgJjGB78FuOas1yiGpVPnV2wAGgzREKgmiXTOzZnAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/castrop1 b/hosts/castrop1
deleted file mode 100644
index b2e0df1..0000000
--- a/hosts/castrop1
+++ /dev/null
@@ -1,10 +0,0 @@
-#Address = ffcas.no-ip.info
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAr1d6XRKMLgt853J8qxguOb017hjVSB4LNWKiLEXk1K5B4sPBP3Sj
-6/3PjI38dbZsmWqOV6azMmqTeBjBKt1Ii02sfrIB0hc3JuwcCeLLrPtmxUWCIXon
-pA0gv1mstM5BY4HLgfH9h9iwtTQ80k3BaTz5/Wcn3i3tRm/MLeXKNIRbIYLGxmyQ
-aSE4QJCnWPXxW+FoKRY6u4jAmYeVi+OyF3Hg9HnVvsBV3AeQ4Ptb90Pkr76udN4D
-W5rEIJelvAT2bMGlCZgowtCEgEAVqI2YHujndHemsUv/ApYR1xwKWRB/df9O8Fpr
-HqdYAjpMtYoGfBj0UhulKZtHpM06LGDZNQIDAQAB
------END RSA PUBLIC KEY-----
-
diff --git a/hosts/hannover1 b/hosts/hannover1
deleted file mode 100644
index 95a691b..0000000
--- a/hosts/hannover1
+++ /dev/null
@@ -1,6 +0,0 @@
-#Address = vpn.hannover.freifunk.net
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAJsf2VLpTQlglzwBWe2B9RIgTEl4Y2a22Xt0DMPRw2vRc4aLcYh9G9TC
-IvlXl87TKILdkZ8jlK9cMmwupAmtoxlRUCDkode1dqZ/Knf+iIOCP3jBPDggKKcR
-/8MmS/ao+Ujb9tTuzv8KhVOqAcezKAHh1rVjriVyhCS/PhmZDViZAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/koblenz1 b/hosts/koblenz1
deleted file mode 100644
index 52e3e23..0000000
--- a/hosts/koblenz1
+++ /dev/null
@@ -1,9 +0,0 @@
-#Address=dsserver.homelinux.org
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAsnls6tKZlZLjmOhjiMTh63GbOaEJ5L3/N4WQPNZN67YOoL0ISECv
-QeQ/p/3iRRhN4EG58CxAJ0X8uqpjqP6xLcbBSDfLbAawjFzU7OrKWiCAmHeW5ZTk
-5sRc6FlR45x63AkaUxiX8VEjBLdrxr6WlHG7XdJtaSYtSpeCESjtWnD3qSQVl7Zr
-CNekrY0TUC4Q0nlmKhNnSISMmJxqvrlGvV+shH2QKSSTOyvOYhl7SwQpJHKfuIOx
-9RbWDG4rrcqks/Kx4WBq/hwiUa8cy0tdoZcbrbjt6rzdIgByDQvcNJ0+hjypbW7H
-j0nr+4GJ9zRGWvE2KopZ3WHE3SvvBeHynQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/ljubljana2 b/hosts/ljubljana2
deleted file mode 100644
index 0a39b02..0000000
--- a/hosts/ljubljana2
+++ /dev/null
@@ -1,6 +0,0 @@
-#Address = AS64768.linuxshell.org
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBALVdchpMeSOA0JBBLwMMdX7hVMlLI2nXZ/0+b8R+36chmsajbKjsDa04
-aw/t/YFo7iLFi3AAXj7Tm/8AXkRz6Rf93rplwo91k47Dz4iEwC/kn7kI8wrGyaTY
-iVdBNp2InZzDeD621OfJa1nhh5ROI0q8T0P76b29Z6XkYJJpCa9pAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/schwarzach1 b/hosts/schwarzach1
deleted file mode 100644
index 2bc46bf..0000000
--- a/hosts/schwarzach1
+++ /dev/null
@@ -1,10 +0,0 @@
-#Address = schwarzach1.hopto.org
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEApZQmRinQZQq7gPjFmltgFxXAv4REhkCAGcPwYl3uUeOwqe4adSDu
-90G99x2sCMAdteQ5YrZsDqYw2DQJS4F0a5IF81+U4wfv97KNil/DG0rxqXALX8v0
-OWfkUJUiblegeBo5R7/x+wDtdJbzmLszsfObo5W+jiyBSBM37RoHI2lfYEhu1+GE
-2t1xWhZXsn65krEnF0mwg6sHzZPza051cQiCLIMSyqmI5jk17FzHfuKwdSKFQKMN
-7rhVwgUgzL6RI5HQYDNjM5VEKHShIZ0MUvUQlhQuZglzIS9W0kvBhAFWg1zkUpaH
-pGl/IK7z2VS5oayGIOpX8e/B0ITWuuzxVQIDAQAB
------END RSA PUBLIC KEY-----
From 0613919bed06e540d33365b5a301da1987908de3 Mon Sep 17 00:00:00 2001
From: hexa- <mweinelt@gmail.com>
Date: Thu, 12 Feb 2015 18:39:05 +0100
Subject: [PATCH 18/96] README.md: Travis-CI state
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 40e50e0..0929bc1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[](https://travis-ci.org/freifunk/icvpn)
+
This repository holds IC-VPN keys and configuration.
For more Info see http://wiki.freifunk.net/IC-VPN
From 52013714c9e3f7058ba33ad16356061d35873762 Mon Sep 17 00:00:00 2001
From: hexa- <mweinelt@gmail.com>
Date: Tue, 17 Feb 2015 15:36:47 +0100
Subject: [PATCH 19/96] check: udp port reachability through nmap, pass
getaddressinfo records where possible
---
.travis.yml | 11 +++++++---
.travis_requirements.txt | 1 +
scripts/check | 44 ++++++++++++++++++++++++++++++++--------
3 files changed, 45 insertions(+), 11 deletions(-)
create mode 100644 .travis_requirements.txt
diff --git a/.travis.yml b/.travis.yml
index be02140..9ae342b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,10 @@
language: python
python: "3.4"
-
-before_install: sudo apt-get install iputils-ping
-script: scripts/check -s ./hosts/
+before_install:
+ - sudo apt-get install iputils-ping checkinstall
+ - wget https://www.linuxlounge.net/~martin/icvpn/nmap_6.47-1_amd64.deb
+ - sudo dpkg -i nmap_6.47-1_amd64.deb
+install:
+ - pip install -r .travis_requirements.txt
+script:
+ - sudo bash -c "source ~/virtualenv/python3.4/bin/activate && scripts/check -s ./hosts/"
diff --git a/.travis_requirements.txt b/.travis_requirements.txt
new file mode 100644
index 0000000..e33c53f
--- /dev/null
+++ b/.travis_requirements.txt
@@ -0,0 +1 @@
+python-nmap
diff --git a/scripts/check b/scripts/check
index aad8271..629a5aa 100755
--- a/scripts/check
+++ b/scripts/check
@@ -4,6 +4,7 @@ import sys
import os
import socket
import subprocess
+import nmap
from optparse import OptionParser
@@ -14,12 +15,15 @@ def error(*arg):
def check_host_lookup(hostname, port):
try:
return socket.getaddrinfo(hostname, port)
- except Exception as e:
+ except Exception:
error("DNS Lookup for {hostname} failed".format(hostname=hostname))
return []
-def check_reachability(host, family):
+def check_icmp_reachability(gai_record):
+ host = gai_record[4][0]
+ family = gai_record[0]
+
if family is socket.AddressFamily.AF_INET:
process_name = 'ping'
else:
@@ -28,8 +32,27 @@ def check_reachability(host, family):
stdout=subprocess.PIPE)
child.communicate()
if child.returncode:
- error("Host {host} is unreachable".format(host=host))
- return 0 if child.returncode == 0 else 1
+ error(" - {host} is icmp unreachable".format(host=host))
+ return True if child.returncode == 0 else False
+
+
+def check_udp_reachability(gai_record):
+ host, port = gai_record[4][:2]
+ family = gai_record[0]
+
+ if family is socket.AddressFamily.AF_INET:
+ arguments = '-sU -PN'
+ else:
+ arguments = '-sU -PN -6'
+
+ scanner = nmap.PortScanner()
+ result = scanner.scan(host, str(port), arguments) # -sU requires root
+ state = result['scan'][host]['udp'][port]['state']
+
+ if state == 'closed':
+ print(" - {host} port {port}/udp is {state}"
+ .format(host=host, port=port, state=state))
+ return False if state == 'closed' else True
def get_hosts_data(srcdir):
@@ -104,11 +127,16 @@ def do_checks(srcdir):
else:
for record in records:
if record[1] is not socket.SocketType.SOCK_DGRAM:
- # we get SOCK_STREAM, SOCK_DGRAM and SOCK_RAW
- # for every IP/Port pair, lets just pick one
- # to have unique ip addresses
+ # vpn connections are udp based, so skip
+ # everything else
continue
- errcnt += check_reachability(record[4][0], record[0])
+
+ if not check_icmp_reachability(record):
+ errcnt += 1
+ else:
+ port_state = check_udp_reachability(record)
+ if not port_state:
+ errcnt += 1
print("{errcnt} errors".format(errcnt=errcnt))
From 733c614ded8aae76f86049934f9b468ddbdbd04a Mon Sep 17 00:00:00 2001
From: hexa- <mweinelt@gmail.com>
Date: Tue, 17 Feb 2015 17:26:47 +0100
Subject: [PATCH 20/96] Frankfurt1 to lowercase, for sort order
---
hosts/{Frankfurt1 => frankfurt1} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename hosts/{Frankfurt1 => frankfurt1} (100%)
diff --git a/hosts/Frankfurt1 b/hosts/frankfurt1
similarity index 100%
rename from hosts/Frankfurt1
rename to hosts/frankfurt1
From c430991d41aa219157570e4b634e097c46606232 Mon Sep 17 00:00:00 2001
From: Daniel Ehlers <danielehlers@mindeye.net>
Date: Wed, 18 Feb 2015 10:14:38 +0100
Subject: [PATCH 21/96] post-merge: Use absolute path for invoke-rc.d.
When the hook is triggered due to an cron job, the path may
not contain "/usr/sbin/" and thus the daemon reload is not happening.
---
scripts/post-merge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/post-merge b/scripts/post-merge
index f45b79f..7adba43 100755
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -25,6 +25,6 @@ for HOST in hosts/*; do
echo "ConnectTo = ${HOST##*/}" >> $TINCCFG
done
-invoke-rc.d tinc reload icvpn
+/usr/sbin/invoke-rc.d tinc reload icvpn
exit 0
From b39f9a670999b42ae7fa21ee1e88ecf700b5fa90 Mon Sep 17 00:00:00 2001
From: Kevin Kirsch <ranlvor@starletp9.de>
Date: Tue, 24 Feb 2015 19:23:34 +0100
Subject: [PATCH 22/96] Added key for trier1
---
hosts/trier1 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 hosts/trier1
diff --git a/hosts/trier1 b/hosts/trier1
new file mode 100644
index 0000000..500dc80
--- /dev/null
+++ b/hosts/trier1
@@ -0,0 +1,15 @@
+Address = gw1.freifunk-trier.starletp9.de
+Port = 655
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAtZakSOECioGgkCutgDyq28LLklVstsowc4oahDHhQt5pTv0ncUzE
+D1rAVWGxYQuD21wu2gCW6zJpS+ZYxGnREIa799tdRtBSL/bH6QQsVpiQiWzpMk0D
+HyOh17fbtqAekOzz3nY6hQFcB3CaJoqY2jrI/iQE15N1iNkA8m1nDnwpHxVtKNmh
+9qq+2EtdXuuJP6o7gayjMLXiB0Iaz6rehlS8jzh6FdrCUQbyuRPW/XtT4tiwd0Ch
+lVXoCnSrM0+tUW++0yQz9aCpLE+IMKcTGm1W3elNOA107R9BiJrPqM3ClP05ThRx
+qWO/hCeJ7/Y0wFZBM2IWNX5ig3bAyhdUOaZA2Pr3HQ7dxRkHMDPOOjIzxPNQUvCm
+M4yKXoC9Fuhy7iujd7fVovXqvwBfLAhm/krMZRftEU01qHdN+Qiemqawz/zx9Yok
+GJwrVEttqXt1CP0yrm2GpLS0YOFCcTO6OGnzOP1AyCi8XjeoshqhT1GgHGky8TMs
+GhMD227a9AIK+XTIGzvOEpYC04CYm9zcWBbcLwQZxZuX4XUIhCsgFtWYN0qHTbc3
+ivhy6Z/MPvJGxiGbipMeZlHu4fEKCtOu4EdddkFLlMKdpA7Jo8PEMXy1zg+LRgWt
+qZJ6AL52KEnR+2zjl3aLoXJ7H0eTAGJjiSMDfp4PXiIWr5amoH7d8QUCAwEAAQ==
+-----END RSA PUBLIC KEY-----
From e0b61477b96e107193a20d58765cd57027526056 Mon Sep 17 00:00:00 2001
From: do9xe <h.l.lueth@gmail.com>
Date: Tue, 24 Feb 2015 22:13:46 +0100
Subject: [PATCH 23/96] this key got lost
---
hosts/flensburg1 | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 hosts/flensburg1
diff --git a/hosts/flensburg1 b/hosts/flensburg1
deleted file mode 100644
index 49f9fe1..0000000
--- a/hosts/flensburg1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = fl1.icvpn.freifunk-flensburg.de
-Port = 656
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAv9Ow8Vkxo03MaYxxpdjQ1/tce2BgyON3+HkHd7/s90wovB6kkFpY
-jL+c6nqN8kIBPhAw4Ibz6HmwUm6GIgappkwI2B81TTfrF2k4LR0NX+Nbyw2UqpnF
-mt4O4ZRDBoRPRJxyXHgxLox0/VqEH+F044nO5DVaCJihlDDVnmjqvdvazBLjsTrX
-d08gPKkyD/VdUMaX6d5eZOfxzRiPYMpZE0rWMzQc+n1kvw1DXfk/jhawqf4ZpaH3
-TD/DGzeuXnDjL2IxMYXHABdfZUug2r7eoP38UM7jVop32SVXQO95gBDs5hTzp9Wh
-JdSYnxO3HgIRb+0g3a7Aq9KBBlQ6xCfZjwIDAQAB
------END RSA PUBLIC KEY-----
From 4ffd0818a78d0d8e1322400b38f71d26ea1514aa Mon Sep 17 00:00:00 2001
From: do9xe <h.l.lueth@gmail.com>
Date: Tue, 24 Feb 2015 22:14:55 +0100
Subject: [PATCH 24/96] delete kiel3, add kiel4
---
hosts/kiel3 | 9 ---------
hosts/kiel4 | 11 +++++++++++
2 files changed, 11 insertions(+), 9 deletions(-)
delete mode 100644 hosts/kiel3
create mode 100644 hosts/kiel4
diff --git a/hosts/kiel3 b/hosts/kiel3
deleted file mode 100644
index 3c83829..0000000
--- a/hosts/kiel3
+++ /dev/null
@@ -1,9 +0,0 @@
-# Address=vpn3.freifunk.in-kiel.de
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAqDth8oT1QRrt1usUz2qb+QfWCrva67Vup3TOuV1Lf6Zo6veRDOcT
-3jCQtQ+BYGAiLgwhrYtJ13oiMlTbpd32ns1dvp5BgaiTWexJuObsC04LVry0kML5
-WyoInGpUD26sqPdXtcs9bAgNzkDCm7cxMtQiu4SGWyNYpfkkIb+4miUKyjnWCrqi
-nWTX2KC4MJh7AMWSrk6vX7aYmV/qmHkIXBqhPKe0Ah6rufc8+ZkSATJJxTM78qwD
-sOO78I3V6av1+QlaF9wCr5/X/eAD6XUEOJWPuiTflC27mDcihW2NE2YwCIDX8vk0
-Ccuo6OGrjJpZz+ncEjCcFICPpKrL8kYCdwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/kiel4 b/hosts/kiel4
new file mode 100644
index 0000000..5a98c54
--- /dev/null
+++ b/hosts/kiel4
@@ -0,0 +1,11 @@
+Address = vpn4.freifunk.in-kiel.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA49H0NRDyDqVy5eJygLHuwLq7VUhrPhyGMhHNcbJ/ZgnwAMkV2wfd
+A+fO4ZXZ498rW3jNLvIxpUH81jsQBe4rFkvnTGZQcY2Lu7Q46XGIp4BNPjtUFIeH
+1qhSANElylo6sZtu651pj2Lu3oV/9cxPDLrKWFaLSLmCrJoh9gkB4Xk4T0T7RWxG
+NyNqdwcCzd+9ITIpRFtcB/pxlO/Ovirvwie+N/aZw8uC52ZOskhI/MSEYzFw+YYR
+aWcoc1sAJ935EY7DET0MV/9yuM+hfRQyex3jKkXzykQL8kQ4t1+0dl3VYMiW6lr6
+LeCasMGtby5sVeA/18H+fu+viZ+qc+wn9wIDAQAB
+-----END RSA PUBLIC KEY-----
From 92b783e197168e96b54c7306d810cd44712edb5a Mon Sep 17 00:00:00 2001
From: bodems <bodems@wopr>
Date: Sat, 14 Mar 2015 19:46:52 +0000
Subject: [PATCH 25/96] added bielefeld4
---
hosts/bielefeld4 | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 hosts/bielefeld4
diff --git a/hosts/bielefeld4 b/hosts/bielefeld4
new file mode 100644
index 0000000..1a60112
--- /dev/null
+++ b/hosts/bielefeld4
@@ -0,0 +1,12 @@
+Address = vpn4.freifunk-bielefeld.de
+Port = 655
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvOJHnI0VCn4ZOVitzitHPHpxHesW4TYf7QafYU6ClQy/Sy9WN5Eg
+lrfszpwZmzABnJZ7T7BQN8j91neKwzj10qr6ppLCDavP0nqQ0CJ+Bg7SCc6HJbsQ
+aDTU1lvNcGKKPD+KchSNxUkOBZjZavVw01taztEnYy6hUy/ml8vdLTUjBBPMUQ0+
+rTe5m/rjPim5J4Eo56kRoJ2TQ3bRNZwTAgV07NAosO5V1qUncPoYsMmS6RrbBVxj
+q7UOEyegBrsFF0F5tdK/itvZIWD2T/0DlDUqoPmfh2j+urbzYwAw9VBc1+4DByfS
+Unn0cQ8AccXTDtMWQVOrLxIhm0JCmiDi6wIDAQAB
+-----END RSA PUBLIC KEY-----
+
From 732d013b39760e229cd42f7fa71d249938f1754a Mon Sep 17 00:00:00 2001
From: bodems <bodems@wopr>
Date: Sat, 14 Mar 2015 19:47:14 +0000
Subject: [PATCH 26/96] removed bielefeld2
---
hosts/bielefeld2 | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 hosts/bielefeld2
diff --git a/hosts/bielefeld2 b/hosts/bielefeld2
deleted file mode 100644
index af6ab59..0000000
--- a/hosts/bielefeld2
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = vpn2.freifunk-bielefeld.de
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAuNUlmNeftDUvk7FAJFvX7XwI9CYnEpdU7TD3waeE6ZbU1mSW0d+n
-9MUArA1iprh9UlPchGrkluIV6lX1XaVYzeXy4HVtf5nLUBssCnbBN8T1PE2qD0rS
-pYKQEc/C1fuGLx07uzKHpz9PufOZQrmiRzoAciZBRZ0y16wtkO5aKV+cHawnnaP2
-rzKeNIKq+XvusalDf0gftr0znivFeHZk7C2XzZ27HjJGcZM8k/xtMiCfMVo6NpZX
-s9hkCrbT6vKtTVWCdAMcZAk0taF8eTPxkRoMMADExeXcoQXIxazvfdV0z+ou/2it
-5X3PohGtF70ZoT98OT2s3xETCea1JyOyDQIDAQAB
------END RSA PUBLIC KEY-----
From 17b07bf03ea219eb0dbf237464994178058e6d0c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Sun, 15 Mar 2015 01:33:38 +0100
Subject: [PATCH 27/96] Update darmstadt1, darmstadt2
---
hosts/darmstadt1 | 2 +-
hosts/darmstadt2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hosts/darmstadt1 b/hosts/darmstadt1
index a0d26c8..f843846 100644
--- a/hosts/darmstadt1
+++ b/hosts/darmstadt1
@@ -1,4 +1,4 @@
-Address = gw01.icvpn.darmstadt.freifunk.net
+Address = gw03.darmstadt.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEAsFBR3wzdRoFXDy38HQtlYDKHvsbY99fUkPZXxg5v3dBGIfWDWMBR
diff --git a/hosts/darmstadt2 b/hosts/darmstadt2
index 80e3f39..535dcf9 100644
--- a/hosts/darmstadt2
+++ b/hosts/darmstadt2
@@ -1,4 +1,4 @@
-Address = gw02.icvpn.darmstadt.freifunk.net
+Address = gw04.darmstadt.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAuohUruR8enzVN1IswdzMuf8f3rY2HOK/yByItBcMHM9b4HMe6Jt6
From 65fa913eab19e3af317d32ac47dcd792c48c5844 Mon Sep 17 00:00:00 2001
From: root-user <me@mortzu.de>
Date: Sat, 21 Mar 2015 16:44:43 +0100
Subject: [PATCH 28/96] Add bremen3
---
hosts/bremen3 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/bremen3
diff --git a/hosts/bremen3 b/hosts/bremen3
new file mode 100644
index 0000000..10efae0
--- /dev/null
+++ b/hosts/bremen3
@@ -0,0 +1,11 @@
+Address = vpn03.bremen.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAr7aAgyRdDjTjJyUhHaPd8aZIybNvi+paDKwkRJFUEHybsSsZs8pl
+mJl+wFFn3sW3y6R7th1iVSqHDU85KYpy7CemKcHRo0VVl0OayToKQGUc9wuUkjM2
+XIpZ6WxJ2+B918780dFA5esdeigSTXnKABt80wllLmBumiumj6fGQnzXOFMfyWSI
+TlpW77EQqZY3uXGlZjbzmCbzmspbldHZKwUBr1f8GW6pdeMzEeptg/5nVLLu0rG+
+o+rXQuU2GxJXd6OwrIWEzLCpxbRNqZ6Xo2o1U4Mc3vrKv7yQ61xY/hYB7BLU89Dz
+tTNXWxy4cm/xYdxmCBStzWGwNRndqNY7fwIDAQAB
+-----END RSA PUBLIC KEY-----
From 3d07e8648902313c08cd1577db24de36439de3a9 Mon Sep 17 00:00:00 2001
From: paalsteek <github@paalsteek.de>
Date: Sat, 21 Mar 2015 23:09:48 +0100
Subject: [PATCH 29/96] add westpfalz2
---
hosts/westpfalz2 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/westpfalz2
diff --git a/hosts/westpfalz2 b/hosts/westpfalz2
new file mode 100644
index 0000000..68605b8
--- /dev/null
+++ b/hosts/westpfalz2
@@ -0,0 +1,11 @@
+Address = gw02.freifunk-westpfalz.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvBxfjw2x1RB9nlypB0uXbb0Ad+bsPA3lVPUTiqf1jp9J7mq3SzQr
+8XXbXSfYENjyLw6rif/7fYvnZsV9Pn+pj+sw7Hwj4JKyloNmLGe26youx+Ik3YXj
+kvmPAF+6SShVAv4TEbOeqVNMggksXevJawPdR9lUrdu86uT49ncAWh29x9LBtLM7
+ZzxacAn/ysIsH8oY+niFT0xTysLD0mxbvWuSrXjFaL4zTtGyT1jOvLyTvkpE10OK
+bVid5JGlkK8+NWFC6pruy1UR0j3+OZ7lsiQsEFrBcj08Dot/msXlvYjcDVtCVFMU
+/SAolG+xq5Olg8dOql4E64N5yoLp7wbTRwIDAQAB
+-----END RSA PUBLIC KEY-----
From 7e72c4403f12cdc5bf01b70f4884b1320d31bc84 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Sun, 22 Mar 2015 17:10:02 +0100
Subject: [PATCH 30/96] darmstadt: update to ipv4 only hostnames for now
---
hosts/darmstadt1 | 2 +-
hosts/darmstadt2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hosts/darmstadt1 b/hosts/darmstadt1
index f843846..813f3c5 100644
--- a/hosts/darmstadt1
+++ b/hosts/darmstadt1
@@ -1,4 +1,4 @@
-Address = gw03.darmstadt.freifunk.net
+Address = ip4.gw03.darmstadt.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEAsFBR3wzdRoFXDy38HQtlYDKHvsbY99fUkPZXxg5v3dBGIfWDWMBR
diff --git a/hosts/darmstadt2 b/hosts/darmstadt2
index 535dcf9..c854b1b 100644
--- a/hosts/darmstadt2
+++ b/hosts/darmstadt2
@@ -1,4 +1,4 @@
-Address = gw04.darmstadt.freifunk.net
+Address = ip4.gw04.darmstadt.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAuohUruR8enzVN1IswdzMuf8f3rY2HOK/yByItBcMHM9b4HMe6Jt6
From 6fe2c149766d1c95190f4be2bba27374cfaad103 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Sun, 22 Mar 2015 17:57:14 +0100
Subject: [PATCH 31/96] check: be more verbose
---
scripts/check | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 45 insertions(+), 5 deletions(-)
diff --git a/scripts/check b/scripts/check
index 629a5aa..dc7235b 100755
--- a/scripts/check
+++ b/scripts/check
@@ -7,9 +7,28 @@ import subprocess
import nmap
from optparse import OptionParser
+ip4, ip6 = 0, 0
+
+
+ANSI_COLOR_ERR = "\x1b[31m"
+ANSI_COLOR_WARN = "\x1b[33m"
+ANSI_COLOR_OK = "\x1b[32m"
+ANSI_COLOR_RESET = "\x1b[0m"
+
def error(*arg):
- print(*arg, file=sys.stderr)
+ print(ANSI_COLOR_ERR, *arg, file=sys.stderr,
+ end='%s\n' % ANSI_COLOR_RESET)
+
+
+def warn(*arg):
+ print(ANSI_COLOR_WARN, *arg, file=sys.stderr,
+ end='%s\n' % ANSI_COLOR_RESET)
+
+
+def ok(*arg):
+ print(ANSI_COLOR_OK, *arg, file=sys.stderr,
+ end='%s\n' % ANSI_COLOR_RESET)
def check_host_lookup(hostname, port):
@@ -32,11 +51,13 @@ def check_icmp_reachability(gai_record):
stdout=subprocess.PIPE)
child.communicate()
if child.returncode:
- error(" - {host} is icmp unreachable".format(host=host))
+ error("{host} is icmp unreachable".format(host=host))
return True if child.returncode == 0 else False
def check_udp_reachability(gai_record):
+ global ip4, ip6
+
host, port = gai_record[4][:2]
family = gai_record[0]
@@ -50,8 +71,17 @@ def check_udp_reachability(gai_record):
state = result['scan'][host]['udp'][port]['state']
if state == 'closed':
- print(" - {host} port {port}/udp is {state}"
+ error("{host} port {port}/udp is {state}"
.format(host=host, port=port, state=state))
+ else:
+ ok("{host} port {port}/udp is {state}"
+ .format(host=host, port=port, state=state))
+
+ if family is socket.AddressFamily.AF_INET:
+ ip4 += 1
+ else:
+ ip6 += 1
+
return False if state == 'closed' else True
@@ -114,9 +144,16 @@ def get_hosts_data(srcdir):
def do_checks(srcdir):
+ global ip4, ip6
+
errcnt = 0
+ warncnt = 0
+
for host in get_hosts_data(srcdir):
print("Checking {community}".format(community=host['community']))
+ if not host['addresses']:
+ warn("no addresses specified")
+ warncnt += 1
for address in host['addresses']:
host, port = address
@@ -126,7 +163,7 @@ def do_checks(srcdir):
errcnt += 1
else:
for record in records:
- if record[1] is not socket.SocketType.SOCK_DGRAM:
+ if record[1] is not socket.SOCK_DGRAM:
# vpn connections are udp based, so skip
# everything else
continue
@@ -138,7 +175,10 @@ def do_checks(srcdir):
if not port_state:
errcnt += 1
- print("{errcnt} errors".format(errcnt=errcnt))
+ print("\nfound {}/{} working ipv4/ipv6 peers".format(ip4, ip6))
+
+ error("{} errors".format(errcnt))
+ warn("{} warnings".format(warncnt))
return 0 if errcnt == 0 else 1
From 1dfac5a953e3f3c24b714590c2e8e65c522651c9 Mon Sep 17 00:00:00 2001
From: Jan-Philipp Litza <janphilipp@litza.de>
Date: Mon, 23 Mar 2015 15:41:36 +0100
Subject: [PATCH 32/96] Rename bremen3 -> bremen1
---
hosts/bremen1 | 17 ++++++++---------
hosts/bremen3 | 11 -----------
2 files changed, 8 insertions(+), 20 deletions(-)
delete mode 100644 hosts/bremen3
diff --git a/hosts/bremen1 b/hosts/bremen1
index 25b6df6..31916c3 100644
--- a/hosts/bremen1
+++ b/hosts/bremen1
@@ -1,12 +1,11 @@
Address = vpn01.bremen.freifunk.net
Port = 656
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy2FfayKB0nuggl/B9Lff
-lLAWf92KPDtmJt6un1nRylX99n1yTatnnzW9r4dv7oDKJVEGxOe9d17CIg0l/lQQ
-UDC0sBJmB+JLQE8INHASQPcRbQVvlRrq+jVSUbpezA8H4W/FDc0kyERJG4zHAW4b
-Om0c8ndFZBU2eMXTyaeFZ5gi6AETZ+GAOt3BGP3lhzVMIotnSf5Mm1q5EOejjlND
-dsz3Fsn3ScWgVeUCjwWK1xs/jg5+pa90he/eqO+DmihxDA0006YBnQcA0kiprjK2
-k6Jo8J1KWD8G3m0XvWOu9z15WAKvkNSw96h28eGefsgQP+XEpEE9aWGcbuj88ycK
-dwIDAQAB
------END PUBLIC KEY-----
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAr7aAgyRdDjTjJyUhHaPd8aZIybNvi+paDKwkRJFUEHybsSsZs8pl
+mJl+wFFn3sW3y6R7th1iVSqHDU85KYpy7CemKcHRo0VVl0OayToKQGUc9wuUkjM2
+XIpZ6WxJ2+B918780dFA5esdeigSTXnKABt80wllLmBumiumj6fGQnzXOFMfyWSI
+TlpW77EQqZY3uXGlZjbzmCbzmspbldHZKwUBr1f8GW6pdeMzEeptg/5nVLLu0rG+
+o+rXQuU2GxJXd6OwrIWEzLCpxbRNqZ6Xo2o1U4Mc3vrKv7yQ61xY/hYB7BLU89Dz
+tTNXWxy4cm/xYdxmCBStzWGwNRndqNY7fwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/bremen3 b/hosts/bremen3
deleted file mode 100644
index 10efae0..0000000
--- a/hosts/bremen3
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = vpn03.bremen.freifunk.net
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAr7aAgyRdDjTjJyUhHaPd8aZIybNvi+paDKwkRJFUEHybsSsZs8pl
-mJl+wFFn3sW3y6R7th1iVSqHDU85KYpy7CemKcHRo0VVl0OayToKQGUc9wuUkjM2
-XIpZ6WxJ2+B918780dFA5esdeigSTXnKABt80wllLmBumiumj6fGQnzXOFMfyWSI
-TlpW77EQqZY3uXGlZjbzmCbzmspbldHZKwUBr1f8GW6pdeMzEeptg/5nVLLu0rG+
-o+rXQuU2GxJXd6OwrIWEzLCpxbRNqZ6Xo2o1U4Mc3vrKv7yQ61xY/hYB7BLU89Dz
-tTNXWxy4cm/xYdxmCBStzWGwNRndqNY7fwIDAQAB
------END RSA PUBLIC KEY-----
From fa01d2091520a8edfa28602a04a38217f7997922 Mon Sep 17 00:00:00 2001
From: Jan-Philipp Litza <janphilipp@litza.de>
Date: Mon, 23 Mar 2015 18:27:14 +0100
Subject: [PATCH 33/96] Add bremen3 (again)
---
hosts/bremen3 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/bremen3
diff --git a/hosts/bremen3 b/hosts/bremen3
new file mode 100644
index 0000000..c9c4369
--- /dev/null
+++ b/hosts/bremen3
@@ -0,0 +1,11 @@
+Address = vpn03.bremen.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAxWLy8tG8W3nV3o7fsm/oD+XwFW2qgGNRDRDiTPGmBNrHVGVCH8cI
+s2Gpeu226x803dukxmrKXZskLBf5oCWxtI5wrxhkiIrb21RkODrMzQcKvOJ3pOGk
+7GekS8WvhxuMAJEKnWiJIS9T3kcGUTMIETSvlWeG/SWkpVr2oFjD87LX+WDCOW/d
+arHyu8xH4XpVaDeKwUHlDz3/QQjI4bOa2UvqmebkdkhX/uWd/hNTdpzUYwghPtPx
+VNlKqeh+NSibYuep/VSoxFx8UHFu083nB2gNTF+b4apjB/4d2iFUMM/Mpgi+lYQ1
+8ksoTu8C3e8KFhp4oP3GLlRuQ2QY+o4RpQIDAQAB
+-----END RSA PUBLIC KEY-----
From 5652fb4a35568827fc12aaa5841aaff3a6d78215 Mon Sep 17 00:00:00 2001
From: 020 Wireless <wireless-amsterdam@lists.puscii.nl>
Date: Sun, 28 Dec 2014 21:34:14 +0000
Subject: [PATCH 34/96] Adding amsterdam node
---
hosts/amsterdam1 | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 hosts/amsterdam1
diff --git a/hosts/amsterdam1 b/hosts/amsterdam1
new file mode 100644
index 0000000..a152aa4
--- /dev/null
+++ b/hosts/amsterdam1
@@ -0,0 +1,9 @@
+address = 195.169.146.33
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAuksyHS3OGQUUS7hVItJZGHK/RDeOzuSyqmi7jbVv+0/IfRLU/mt+
+kz/wMz2O/UDxyR84wmrLTVdt8TYnOaFBrlNdMGz3k2HjbZc0UxZpKxHMYR4US6Ab
+vLApHSxXK44c16wcWDhQB9yHqM3GdMTdbxuKV60qclulHuI9wHkxDtn1qb1dEkbv
+2rF2ldfZnNCZ7ktQ1Pnnkv9lOhT1WK8Ye2Sbl+V7klK7leRfE/eTM5e1KP4Zlf62
+iecoBCzFKCAk3Zw88Sv9IlkVG1ZgO8rdZPH7Bb461XH4W0gO9BANg2/SnW0Hlnyp
+Ye2Bh+oGwQTlxjxN44nKOcornozC8kZUuwIDAQAB
+-----END RSA PUBLIC KEY-----
From 6d59fed131b2bda01f6ae5acb8f517b7502d5449 Mon Sep 17 00:00:00 2001
From: Steffen <email.sd.ipod@gmail.com>
Date: Tue, 7 Apr 2015 13:42:42 +0200
Subject: [PATCH 35/96] Delete ehingen1
Freifunk Ehingen ist nicht mehr aktiv.
---
hosts/ehingen1 | 11 -----------
1 file changed, 11 deletions(-)
delete mode 100644 hosts/ehingen1
diff --git a/hosts/ehingen1 b/hosts/ehingen1
deleted file mode 100644
index 3c7d3ae..0000000
--- a/hosts/ehingen1
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = gw01.freifunk-ehingen.de
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAz1zcs2ZgiZRLVXQyqYXKD3+dx7imqN/cmJ6CYoSfxjesslWaS+qG
-29YH+U7qXSDgRyjVtdXdVHIa9dYSKff292H7yzX3LbHPsUEeq5kAAqqieTIsRYoI
-6QeUTYkfSuvkqmAe1zUmC5fcf8BRSu2YUHSWhM5Lu9ulWzXuKYoipnXgqQzVz67w
-3DnYEx/DEAxn4LKagOpUq+l9OzChOtMWeW1/MSCaEhm7VLYaY9YITdhb5U61PB7F
-fdv/77AhRBjL6zfNX6M9ZookKukAz3KHme5EzDYXVA4CiyBN+HMzgCYHbqopOiVZ
-BGjNAeO8FjAkBwn5Os608LOSocOEVz9KDwIDAQAB
------END RSA PUBLIC KEY-----
From b890378640c797c42e9c394c52692220122f8fb1 Mon Sep 17 00:00:00 2001
From: dracoTrier <github@basisbit.de>
Date: Sat, 11 Apr 2015 01:15:04 +0200
Subject: [PATCH 36/96] Add trier2
---
hosts/trier2 | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 hosts/trier2
diff --git a/hosts/trier2 b/hosts/trier2
new file mode 100644
index 0000000..7cd10b5
--- /dev/null
+++ b/hosts/trier2
@@ -0,0 +1,10 @@
+Address = gw2.freifunk-trier.starletp9.de
+Port = 655
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAu5IiDnY5Ix54b0fb6HqXM5GggH9TQCPTXqUnKgurPkiOHr+OcMSB
+6LlE3v0N2HJYS+UJmjHZtNd9z4SdhQoft6t1vEM48G9gi0HDJoLvi+ZnEHbW0LdP
+PE5H2gwEzrZ6YAtbFiyM55dVY/5G3fYEF7nrB1ItAkqujUfWoLSVE1q08Gt/MbnK
+7X5rnr8JWquuj2vcn4KBn4YHuLBMNCotNINzDOECqst3CZLUioKoxQenhpyX/ZP0
+A0RNqpf6msFMiRY5+qEhXQYqP7ztc9MaLb5+7dvSePkjR4tEvBEizV5Qxxzpb6FA
+ZnOEZT5UV+Pgx8iyBuyXnHeDB4X4F3gbLwIDAQAB
+-----END RSA PUBLIC KEY-----
From 0dc1fc7be3b9bd764149aa89618d51d94bebe8fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Mon, 13 Apr 2015 02:35:52 +0200
Subject: [PATCH 37/96] post-merge: allow case-insensitive address parameter in
host config
---
scripts/post-merge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/post-merge b/scripts/post-merge
index 7adba43..1e77b4e 100755
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -20,7 +20,7 @@ sed -i '/^ConnectTo/d' $TINCCFG
for HOST in hosts/*; do
# skip hosts without address
- grep -q '^Address' -- "$HOST" || continue
+ grep -iq '^Address' -- "$HOST" || continue
echo "ConnectTo = ${HOST##*/}" >> $TINCCFG
done
From c455a29485e527546e4a26bd0c85cce7759cd24c Mon Sep 17 00:00:00 2001
From: joerg-d <joergd@bitquell.de>
Date: Thu, 16 Apr 2015 08:38:22 +0200
Subject: [PATCH 38/96] Create gw1 of gera-greiz
---
hosts/gera_greiz1 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/gera_greiz1
diff --git a/hosts/gera_greiz1 b/hosts/gera_greiz1
new file mode 100644
index 0000000..cb4c04e
--- /dev/null
+++ b/hosts/gera_greiz1
@@ -0,0 +1,11 @@
+Address = gw1.freifunk-gera-greiz.de
+Port = 10781
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEArLhMleQyfCgADO1vPEHK1hTJ8ZW/NljeiFsZcvTHCRKnnfF0AP1S
+XfcviGlQCV3sfhXLdKABe0QZiLeHwbJY2R/n0PJxG/UxfscAKH+vRCa6qA4PqVI7
+CLShMe+E/S66UPvYzYYwBpfLBFYlaMzSz+IhvhiRwoCWgk/0+YfPJt85mFSUHNxN
+XGiBLJBSRGnGi9BFSw+GbrN86lmknV/fnL4uypFw94TJYF0Q7TexgP7aRtFSOciH
+2tDCbzzJh7lmw4XE1Wtz7QWUP/R34zqlOELXlmoilbkTO71y4qlCeTHmaWDOG9/f
+VScV3K/v1mrofNlK35GJzfcOp9ueijIbZwIDAQAB
+-----END RSA PUBLIC KEY-----
From e3247d7cb5862d73ccd0aff51d859ee9b5032443 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Sat, 18 Apr 2015 16:34:39 +0200
Subject: [PATCH 39/96] Introduce the concept of metanodes updates the README
file, and makes the post-merge script read the metanodes file instead of the
whole hosts/ directory.
---
README.md | 66 ++++++++++++++++++++++++++++++++++++++++++++--
metanodes | 4 +++
scripts/post-merge | 8 +++---
3 files changed, 72 insertions(+), 6 deletions(-)
create mode 100644 metanodes
diff --git a/README.md b/README.md
index 0929bc1..71de455 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,68 @@
[](https://travis-ci.org/freifunk/icvpn)
-This repository holds IC-VPN keys and configuration.
+This repository contains the tinc hosts for ICVPN-Peers and several helper scripts.
+
+## Setup
+
+This network requires the use of the Tinc VPN Daemon. You should use at least version 1.0.24 or higher, als the
+current pre-release version 1.1pre11 seems to work just fine.
+
+### Clone the repository
+ cd /etc/tinc/
+ git clone https://github.com/freifunk/icvpn.git
+ cd icvpn
+ cp scripts/post-merge .git/hooks/
+
+### Create your tinc configuration
+
+Open your favorite editor and create the /etc/tinc/icvpn/tinc.conf.
+ Name=entenhausen1
+ Mode=switch
+More options can be found through
+ man tinc.conf
+Afterwards create a keypair with tincd.
+ tincd -n icvpn -K
+Hint: In version 1.1 this option was moved to the tinc binary and is called <code>generate-rsa-keys</code>.
+
+### Execute post-merge hook
+
+This step is necessary to populate your new configuration with infos about the metanodes.
+ ./git/hooks/post-merge
+
+### Set up a cronjob to update the repository in regular intervals.
+
+ @daily cd /etc/tinc/icvpn/; git pull > /dev/null
+
+## What are meta nodes?
+
+Tinc has a ConnectTo configuration option that describes which peers on startup to connect *and* sync metadata to.
+
+Until now (2015/4) we had roughly 74 nodes, and every node connected to each other (full mesh). Tinc however
+does not scale this way, because on each connect and disconnect all ConnectTo-lines are being notified of this
+and then notify their neighbours again. Many smaller nodes seemingly could not handle the amount of metadata generated
+by this which resulted in TCP Zero Windows. They then disconnected, and reconnected, producing more metadata in
+the process, which was followed by even larger nodes queueing up metadata, which resulted in all nodes taking
+a massive cpu and memory hit. Memory usage of up to 1.5GB was spotted, accumulated in less than 12 hours.
+
+However for tinc to build its network graph it is sufficient, if all nodes only exchange metadata at a few nodes,
+which results in much less strain on the whole network. This is why we now use meta nodes, which are defined in
+the `./metanodes` file.
+
+Criteria for the selection of meta nodes are:
+1) autonomous system diversity
+2) community diversity
+3) ample resources (cpu, memory, traffic)
+
+When data needs to be transferd between two nodes, this will happen indepently of those meta nodes. Through the shared
+network graph a direct transfer is possible and will be tried: at first via UDP, then via TCP, then indirectly. While
+indirect routing is possible the meta nodes are not required to provide forwarding for those packets.
+
+## Contact
+
+The maintainers can be reached at
+- [icvpn@lists.funkfeuer.at](mailto:icvpn@lists.funkfeuer.at)
+- [irc.hackint.org #icvpn](irc://irc.hackint.org/icvpn)
+
+We have set up IRC notifications for all repositories concerning the icvpn network.
-For more Info see http://wiki.freifunk.net/IC-VPN
diff --git a/metanodes b/metanodes
new file mode 100644
index 0000000..5adfa0f
--- /dev/null
+++ b/metanodes
@@ -0,0 +1,4 @@
+berlin2
+darmstadt2
+luebeck2
+trier1
diff --git a/scripts/post-merge b/scripts/post-merge
index 1e77b4e..b70396a 100755
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -18,12 +18,12 @@ test -w $TINCCFG || fail "ERR: $TINCCFG is not writeable"
sed -i '/^ConnectTo/d' $TINCCFG
-for HOST in hosts/*; do
+while read HOST; do
# skip hosts without address
- grep -iq '^Address' -- "$HOST" || continue
+ grep -iq '^Address' -- hosts/"$HOST" || continue
- echo "ConnectTo = ${HOST##*/}" >> $TINCCFG
-done
+ echo "ConnectTo = $HOST" >> $TINCCFG
+done < metanodes
/usr/sbin/invoke-rc.d tinc reload icvpn
From 51582c31858f543baf74b8472463d052501c83cc Mon Sep 17 00:00:00 2001
From: hexa- <mweinelt@users.noreply.github.com>
Date: Sat, 18 Apr 2015 16:43:09 +0200
Subject: [PATCH 40/96] README.md: fix formatting
---
README.md | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 71de455..7849425 100644
--- a/README.md
+++ b/README.md
@@ -4,33 +4,39 @@ This repository contains the tinc hosts for ICVPN-Peers and several helper scrip
## Setup
-This network requires the use of the Tinc VPN Daemon. You should use at least version 1.0.24 or higher, als the
+This network requires the use of the Tinc VPN Daemon. You should use at least version 1.0.24 or higher, also the
current pre-release version 1.1pre11 seems to work just fine.
### Clone the repository
- cd /etc/tinc/
- git clone https://github.com/freifunk/icvpn.git
- cd icvpn
- cp scripts/post-merge .git/hooks/
+ # cd /etc/tinc/
+ # git clone https://github.com/freifunk/icvpn.git
+ # cd icvpn
+ # cp scripts/post-merge .git/hooks/
### Create your tinc configuration
Open your favorite editor and create the /etc/tinc/icvpn/tinc.conf.
+
Name=entenhausen1
Mode=switch
More options can be found through
- man tinc.conf
+
+ # man tinc.conf
Afterwards create a keypair with tincd.
- tincd -n icvpn -K
+
+ # tincd -n icvpn -K
Hint: In version 1.1 this option was moved to the tinc binary and is called <code>generate-rsa-keys</code>.
### Execute post-merge hook
-
This step is necessary to populate your new configuration with infos about the metanodes.
- ./git/hooks/post-merge
+
+ # ./git/hooks/post-merge
### Set up a cronjob to update the repository in regular intervals.
+ # crontab -e
+and insert for example
+
@daily cd /etc/tinc/icvpn/; git pull > /dev/null
## What are meta nodes?
@@ -49,9 +55,10 @@ which results in much less strain on the whole network. This is why we now use m
the `./metanodes` file.
Criteria for the selection of meta nodes are:
-1) autonomous system diversity
-2) community diversity
-3) ample resources (cpu, memory, traffic)
+
+1. autonomous system diversity
+2. community diversity
+3. ample resources (cpu, memory, traffic)
When data needs to be transferd between two nodes, this will happen indepently of those meta nodes. Through the shared
network graph a direct transfer is possible and will be tried: at first via UDP, then via TCP, then indirectly. While
From 98d313a675e36e00afcb389f4730baeb67bee983 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Sat, 18 Apr 2015 16:57:24 +0200
Subject: [PATCH 41/96] darmstadt: reenable dual-stack with tinc1.1
---
hosts/darmstadt2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/darmstadt2 b/hosts/darmstadt2
index c854b1b..535dcf9 100644
--- a/hosts/darmstadt2
+++ b/hosts/darmstadt2
@@ -1,4 +1,4 @@
-Address = ip4.gw04.darmstadt.freifunk.net
+Address = gw04.darmstadt.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAuohUruR8enzVN1IswdzMuf8f3rY2HOK/yByItBcMHM9b4HMe6Jt6
From 5f3104f10b8e4beab0488ed813dfbb4616c31127 Mon Sep 17 00:00:00 2001
From: ohrensessel <git@ohrensessel.net>
Date: Mon, 20 Apr 2015 09:29:01 +0200
Subject: [PATCH 42/96] hamburg: remove Port= lines, make hamburg02 reachable
again
---
hosts/hamburg01 | 1 -
hosts/hamburg02 | 3 +--
hosts/hamburg03 | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/hosts/hamburg01 b/hosts/hamburg01
index 4e6e83d..f339aa0 100644
--- a/hosts/hamburg01
+++ b/hosts/hamburg01
@@ -1,5 +1,4 @@
Address = 01.icvpn.hamburg.freifunk.net
-Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA3IbMWLjnM3S4HsFfKvhJdg9TYRPnzxRyL2CaL5KtcCTu8mMMOeCX
diff --git a/hosts/hamburg02 b/hosts/hamburg02
index b282957..bbbad9d 100644
--- a/hosts/hamburg02
+++ b/hosts/hamburg02
@@ -1,5 +1,4 @@
-# Address = 02.icvpn.hamburg.freifunk.net
-# Port = 656
+Address = 02.icvpn.hamburg.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEApyg+KLP9XfIwOIgBHjbGgt0l5ve+/O1Mec3ed/d0q6Bh+oTkJxOn
diff --git a/hosts/hamburg03 b/hosts/hamburg03
index 854bc9d..36fe0e5 100644
--- a/hosts/hamburg03
+++ b/hosts/hamburg03
@@ -1,5 +1,4 @@
Address = 03.icvpn.hamburg.freifunk.net
-Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEApitk4y7bZ8yI5U7pY87C8OdHMiYMQbMfd8KmttVhCFHaXgpbp6L5
From 78695a245e24e11d5460974792b2fec8e0cad030 Mon Sep 17 00:00:00 2001
From: ohrensessel <git@ohrensessel.net>
Date: Mon, 20 Apr 2015 09:31:16 +0200
Subject: [PATCH 43/96] metanodes: add hamburg03 as discussed
---
metanodes | 1 +
1 file changed, 1 insertion(+)
diff --git a/metanodes b/metanodes
index 5adfa0f..522ea7f 100644
--- a/metanodes
+++ b/metanodes
@@ -2,3 +2,4 @@ berlin2
darmstadt2
luebeck2
trier1
+hamburg03
From 8088eadc9c1bf7274a720eedf7ce989a4d794a00 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Thu, 23 Apr 2015 22:44:40 +0200
Subject: [PATCH 44/96] darmstadt: reenable dual-stack for darmstadt1
---
hosts/darmstadt1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/darmstadt1 b/hosts/darmstadt1
index 813f3c5..f843846 100644
--- a/hosts/darmstadt1
+++ b/hosts/darmstadt1
@@ -1,4 +1,4 @@
-Address = ip4.gw03.darmstadt.freifunk.net
+Address = gw03.darmstadt.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEAsFBR3wzdRoFXDy38HQtlYDKHvsbY99fUkPZXxg5v3dBGIfWDWMBR
From f1f82e67c2192b37eb911bd6ab88ff68bdc6501f Mon Sep 17 00:00:00 2001
From: Philipp Hirsch <itself@hanspolo.net>
Date: Tue, 28 Apr 2015 10:44:22 +0200
Subject: [PATCH 45/96] Add host kassel3
---
hosts/kassel3 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/kassel3
diff --git a/hosts/kassel3 b/hosts/kassel3
new file mode 100644
index 0000000..56694e6
--- /dev/null
+++ b/hosts/kassel3
@@ -0,0 +1,11 @@
+Address = vpn3.ffks.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1GDz1qNLj4EVXc07Zg+KXqIsgL+cyacxJsqt8yklQVeY5s8/jeKn
+UFQQb91TGrWKEqGWUyeFDPYOqTsHWQO0VDspidkeBP+6ijlPxnlaf9cO5ZR/Xjv1
+n2ndcEkTzRNUTpHhHBG9iQtVYUH1O9j0n4rBAVnF1o6IWVrYgAgusMnKd6W8NJ5K
+IGepgRZRi3gIjOQj/YqKPma/vZC7gBkksSpNf2dXusUSisztb7lfhGJgaAP5Fg5d
+vr0Jrd9NEDiy5TgH1oMpQcpCCAOSvEdhhbb6XPRCZIb+WCobV06GeV7vhmIl0tKe
+IRL/y2Fgm2QO+JNr7jvoa1LxrZYvWCXIywIDAQAB
+-----END RSA PUBLIC KEY-----
From e107531586218bc3c446f95c8e36e7082ae335ca Mon Sep 17 00:00:00 2001
From: Philipp Hirsch <itself@hanspolo.net>
Date: Tue, 28 Apr 2015 11:27:05 +0200
Subject: [PATCH 46/96] add host kassel1
---
hosts/kassel1 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/kassel1
diff --git a/hosts/kassel1 b/hosts/kassel1
new file mode 100644
index 0000000..66e34c7
--- /dev/null
+++ b/hosts/kassel1
@@ -0,0 +1,11 @@
+Address = vpn1.ffks.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvKiRJR1BTj2pGVEhJJCQPs15gz85eyfB10mMB9yJ+5fA4OyeJnMs
+ZRAWtG1/ViTDG2a6rt1oF/k7KuWIuhC+aQTI4quniBV6Tk+7kJg/BgW0nPpn7H8n
+wpSxF91kq1HGiMmZs9jF1Am/5cIdUeA437ZX/W5qN/L2h5mGzw4wTLLH6GD/D0p0
+cEkyTVaXhlswOx0xj8T2/Ugzk8wK4QACa1ZwfVFMuuB3HsBmXOMAH4fEyogdlTSv
+INNhZ2gLT1B4XbKbDwJ+MrOOMz3XbqvaGTHW1I5Jo0y98Ckwqis20eWg0BljgdCM
+2PFkFNWCkf14Wc4EpRS4+eGXj/a7v4s7nQIDAQAB
+-----END RSA PUBLIC KEY-----
From 69910ab0e480d3e2ae2fe541b7490c1cc750a311 Mon Sep 17 00:00:00 2001
From: Stefan Rauscher <s.rauscher@litd.de>
Date: Thu, 7 May 2015 14:45:11 +0200
Subject: [PATCH 47/96] Add host dreilaendereck4
---
hosts/dreilaendereck4 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/dreilaendereck4
diff --git a/hosts/dreilaendereck4 b/hosts/dreilaendereck4
new file mode 100644
index 0000000..5790296
--- /dev/null
+++ b/hosts/dreilaendereck4
@@ -0,0 +1,11 @@
+Address = gw4.freifunk-3laendereck.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA6ijzZkaqqEHOazFRzCPesuCTUCAtgVa3JrBm2R5cb2rLuDQDmqQm
+O8zqlj3rM8cBRGexRz/2F9FNxQcEhfPmowiigGlDXW6rzcFDWeGl7w4rn75rP3a+
+gfmbSOmRLG/dvghDRceDEbr6MU7DlCOgHjaz+WdHmJWR0gnlnQJLqMa1RgPN24GK
+orq8h158645pDbX/wJCNdBB81X4kgJOjWJF+ic2qbF0iuUKt1689QJnn6Mo+9T5y
+K+xt9c5XlgqqD4UxP4JF66ctoN8aBscPFOEZfUjujNqvKhCWbhal13EHM9dCEnQA
+1Myf7sRdaLvMpKsvSESMfl588I/XulszMwIDAQAB
+-----END RSA PUBLIC KEY-----
From 94fbbefb0b2f6dab25a298c580a84ba21ec27992 Mon Sep 17 00:00:00 2001
From: Christian Bricart <christian@bricart.de>
Date: Mon, 11 May 2015 14:36:16 +0200
Subject: [PATCH 48/96] add host aachen1
---
hosts/aachen1 | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 hosts/aachen1
diff --git a/hosts/aachen1 b/hosts/aachen1
new file mode 100644
index 0000000..3839a42
--- /dev/null
+++ b/hosts/aachen1
@@ -0,0 +1,10 @@
+Address = icvpn.freifunk-aachen.de
+Port = 1655
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAoGeD5b1HKW2UAFpIPayxsOOYx5qC0oHrJnvcPH33jnDBGiOYJ9ma
+QZErWdF0Qsnqh/wJE6i569fzKWOUdLHrN5dVzD/Q5zjMOwJf3rmcerS0oAFTxKDj
+pkw2kKcLA/lSNMIN//W66mM258BLo1XgEraUx5RcJ4hTxawhNTn0NTJVCbfUX6e5
+tcJpbgbYRzBTUPdSL3OB8k0qlmFI2ZYTnCzOSpgxRQARIB1ecoqOYVxQISK2pzxi
+MHQQlVbquwldaKiVoj7tD7PFW4oQxpiMHZnHIA6dnZCsT3ktTOzCjhf2XMi8o8u5
+P9C5dYrmVWrVAWQznlbuq/w1z+PrTYquoQIDAQAB
+-----END RSA PUBLIC KEY-----
From f46ef57b5e51b5361ab8b56b938ef3b4575f401b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Mon, 11 May 2015 15:15:14 +0200
Subject: [PATCH 49/96] post-merge: prefer the tinc1.1 cli over invoke-rc.d if
it exists
---
scripts/post-merge | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/post-merge b/scripts/post-merge
index b70396a..f7880de 100755
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -7,6 +7,8 @@
# 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/"
#
+PATH=/usr/sbin:$PATH
+
fail() {
echo "$1" >&2
exit 1
@@ -25,6 +27,11 @@ while read HOST; do
echo "ConnectTo = $HOST" >> $TINCCFG
done < metanodes
-/usr/sbin/invoke-rc.d tinc reload icvpn
+if hash tinc; then
+ # prefer the command line interface that comes with tinc1.1 if it exists
+ tinc -n icvpn reload
+else
+ invoke-rc.d tinc reload icvpn
+fi
exit 0
From b78523fb0789723eef07f670fcd5c17737d731e2 Mon Sep 17 00:00:00 2001
From: Christian Bricart <christian@bricart.de>
Date: Mon, 11 May 2015 18:40:34 +0200
Subject: [PATCH 50/96] it is icvpn.NODES.freifunk-aachen.de .. fscking
Wildcard DNS..
---
hosts/aachen1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/aachen1 b/hosts/aachen1
index 3839a42..422c043 100644
--- a/hosts/aachen1
+++ b/hosts/aachen1
@@ -1,4 +1,4 @@
-Address = icvpn.freifunk-aachen.de
+Address = icvpn.nodes.freifunk-aachen.de
Port = 1655
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAoGeD5b1HKW2UAFpIPayxsOOYx5qC0oHrJnvcPH33jnDBGiOYJ9ma
From e9383fcbe56063bb7534cf3b18686315a293263f Mon Sep 17 00:00:00 2001
From: olliff <devel@syscontrol.net>
Date: Fri, 15 May 2015 06:24:33 +0200
Subject: [PATCH 51/96] local community freifunk westkueste added
---
hosts/westkueste1 | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 hosts/westkueste1
diff --git a/hosts/westkueste1 b/hosts/westkueste1
new file mode 100644
index 0000000..92ec42a
--- /dev/null
+++ b/hosts/westkueste1
@@ -0,0 +1,10 @@
+Address = 01.icvpn.freifunk-westkueste.de
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvpWNaR4X4arH41BS0LNSnMIWDJAfByhJR6w5W3lAgAUKK0V2nVa0
+KRIEIWOMXgahbCwEPZHn/F+N4JA4H8/oMjseevfBipkBkGekRUAI6OXSLU1h+Vha
+Q1BrHHo0rzM81WcNJoV5XjEHSZ+3PK6HY0Tbw3K4wAo0HKAft+hDCYAdwZXm+dAi
+ExfwRp06FRNoiLSUD1JSnRIji+PJFJh7ZmulDNANd4+gBsAqQdkf7tCG05rjor/v
+XCJlLQKPbil+cxC1t+vrz4x02h27v7bBDgs5+joAmRsnpCnDT8YERhf+yQw5xJcw
+XtEVvM0ZeRhmVfFECY9lz4LSBlXVvyn8SwIDAQAB
+-----END RSA PUBLIC KEY-----
From c3a61f8fbcfbbdf6a22d046a59b2e9b8e7c3d8e1 Mon Sep 17 00:00:00 2001
From: Ronny Trommer <ronny@opennms.org>
Date: Fri, 15 May 2015 21:03:12 +0200
Subject: [PATCH 52/96] FFFD: Added fulda1 tinc VPN
- Added tinc gw03.freifunk-fulda.de VPN endpoint
---
hosts/fulda1 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 hosts/fulda1
diff --git a/hosts/fulda1 b/hosts/fulda1
new file mode 100644
index 0000000..d9358ee
--- /dev/null
+++ b/hosts/fulda1
@@ -0,0 +1,15 @@
+Address = gw03.freifunk-fulda.de
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAw97CxdW9jjI6gHExRsls5rCJ9mt2FW4jLg6AiUAlcKo6gJkAK7dn
+TK72ckMBoFc0oQTqOAMtdxPGdkojqy9jfOGRnJrEPru8zfHaL2AHEy3BO8DTdt6P
+43UB5dxymfEcaLi/5lMyjuwX1AwnWZwh3yHhUjjSIRo2f8Ph6iiVWOOCcTTv4YGb
+8ODSNjtsmDtAv9Ejj4+GJaMAtKn2KP0u73C2ix169nUtfIdRN9OCx50ZHig8GVqZ
+LwWK0zDpOStlgNaBhCne8LO8yHnMyimrNIBRORNFR04YtUt0ubiZqjLm14wFLe0t
+zJqqquOXA7Es2ztvX5PP+xhyPv9N8hd5t4kg/2OExkZZ4JVN8Npb1bNQurEon38a
+RFnbKSKXxrN2UGwJLKrJa3GkXCrFVn1M+/XnQkT2VjkaPYjOPDNr6j2oUj07/mAS
+Xs74TBDIk+Re1xmUsuehzBd9CfhnWJCc/JOgZuLeWThm0RccOCFFRBLz92QFzVnZ
+NXVGTLktNMGnMdDZ0EjLoXQzWQRJEJ4gSeQRfsFYFvMk9qPwRoXB1pMHSckNoSxK
+4Bfwl+md6eF9g74aGQ0JrhO+mpUcSrEWbh0w4W4jhU7UuTxxAwKrHBYt77012QrQ
+g0L07Z1lY4DB1FWXkkJ7VWI0rUJpCzUKJH34kQGhJ771Rwq0TGAli70CAwEAAQ==
+-----END RSA PUBLIC KEY-----
From 0f0eeac818937c27cb099d84e332515299722a20 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Fri, 15 May 2015 21:17:42 +0200
Subject: [PATCH 53/96] =?UTF-8?q?Neuer=20Host=20Freifunk=20M=C3=BCnsterlan?=
=?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
hosts/muensterlandFK | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 hosts/muensterlandFK
diff --git a/hosts/muensterlandFK b/hosts/muensterlandFK
new file mode 100644
index 0000000..aad6fef
--- /dev/null
+++ b/hosts/muensterlandFK
@@ -0,0 +1,10 @@
+Address = 37.120.168.53
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvPXymyzB4wGKvoCteVEABNx8sSxH+zWUbpvr/UmGqfvR/kc1tgEq
+cEhygHxJOQ3yzO/YdNxYE3SBBl2IuyUw+mpvxPv0CMZheYlJPevWrdRpXI7/kWvU
+4ZXKys5ImG/OWmRyeliiyQo/CuCGqctATlV4bzlFnZxObRTfSw1+DY0sfZM43wvA
+v03Pd+Q0il6wSvH+60YTALoCSzXzvegr9QmszUEQr+HQwcZuPapNqkeZV8L7HpCb
+1uKpTpBZaAqLKItgAo5dl19pXe8kWfw1i3HHMYgW1LRHAbdCVUquMJhi1IY1eOX7
+5lp28qZFWPotB02NOLeDLFMkMd/P4emaDQIDAQAB
+-----END RSA PUBLIC KEY-----
From 02c53cf69606fb09b54b33c42b97b80a334bf936 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Fri, 15 May 2015 22:53:41 +0200
Subject: [PATCH 54/96] eintrag mit hostname
---
hosts/muensterlandFK | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/muensterlandFK b/hosts/muensterlandFK
index aad6fef..e243dda 100644
--- a/hosts/muensterlandFK
+++ b/hosts/muensterlandFK
@@ -1,4 +1,4 @@
-Address = 37.120.168.53
+Address = fusselkater.gw.freifunk-muenster.de
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAvPXymyzB4wGKvoCteVEABNx8sSxH+zWUbpvr/UmGqfvR/kc1tgEq
From 7b563eccd44046c25c1b4bb191d99d0d479d32bb Mon Sep 17 00:00:00 2001
From: "@RubenKelevra" <ruben@freifunk-nrw.de>
Date: Wed, 20 May 2015 21:10:01 +0200
Subject: [PATCH 55/96] add nrw1
---
hosts/nrw1 | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 hosts/nrw1
diff --git a/hosts/nrw1 b/hosts/nrw1
new file mode 100644
index 0000000..da23a64
--- /dev/null
+++ b/hosts/nrw1
@@ -0,0 +1,15 @@
+Address = rig.vfn-nrw.de
+
+-----BEGIN RSA PUBLIC KEY-----
+MIICCgKCAgEAwPiIGCFsBFWSo7UZZkLhH22D7g6QbXzrLtTWcMAvYYNIGCmS7G94
+aGwQ20ccrUeAtLt+P6y1+TPinOndnIPQND5kxnV4d18PCCrj1ipz0B/hUH0c47K3
+JVu1X7n1CxZwSHQ3/EHSGDEb4Q6K8vIVwmGE9WL8tCALgmBB9PzLwrLNkJDjv6ky
+4Jmb3JftPvBNwjlNXbRBDh7Pqpnp/9N+/TkdK35KHpThBHNNdkUozKr9+8FzXcph
+foC9nbArlXuJTSQVLvjfj03eFCE/Cc0iFCJDnFXtxnFNsLHohCbEi1epzYStNiCh
+/urOJyiCVIVtZ2hnUUuh3TKjHITUbF3QRtwp7cu6DrAqWmAG/sEjlsnby56AXeIn
+HZPFMswzV/cHAli+lkVL6kRx9/WWA8yEJaM1T4l/j74lORQJmgcTuuAv8rzSy8Qm
+5MwRiWn31CaSLTmYp6Sw43r8wurEX1Bvmbbd8845LGpfXjaNJ2mzEETdNd72R6GG
+1kTDZBYOMZ9Ty6BDLSgU1EiijCAvI1J8rnXxLb+3ttMXnixlQgg8XiZNC2L0PvL4
+VVtaZBElIBXFbLs9LLPWq4/HDviUEdz0+5f5W0MtjrikJ1DwZYyUZKC/fBXHvw/p
+gKeW1YG/1E4K70JDdSxRKvaq2n+LFfvRmGWG0SM0jmqElUc0vopfOh0CAwEAAQ==
+-----END RSA PUBLIC KEY-----
From c8790b51d77cc96ed8b4440b335d0daa53f3c596 Mon Sep 17 00:00:00 2001
From: "@RubenKelevra" <ruben@freifunk-nrw.de>
Date: Wed, 20 May 2015 21:10:45 +0200
Subject: [PATCH 56/96] update nrw2 address
---
hosts/nrw2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/nrw2 b/hosts/nrw2
index ff8aae8..589d275 100644
--- a/hosts/nrw2
+++ b/hosts/nrw2
@@ -1,4 +1,4 @@
-Address = bragi.wk.freifunk.net
+Address = bragi.vfn-nrw.de
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA2i89suXrS03mxdWvdmtMH0F3ZSJ7xrkwzpVgEJvYqNCbWCBPKaLF
From 6c49915b3679055bdbee75bfcab41fc4fe5477d0 Mon Sep 17 00:00:00 2001
From: root <root@map.freifunk-troisdorf.de>
Date: Wed, 20 May 2015 23:49:09 +0200
Subject: [PATCH 57/96] Added Server Adress for Troisdorf1
---
hosts/troisdorf1 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/troisdorf1
diff --git a/hosts/troisdorf1 b/hosts/troisdorf1
new file mode 100644
index 0000000..485de4a
--- /dev/null
+++ b/hosts/troisdorf1
@@ -0,0 +1,11 @@
+Address = gateway2.freifunk-troisdorf.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA158/RHkey6Sess08Koxrt3rKUJ1jhzb5cyMEJ7oTG3f+Qv/EMdn3
+aiL3PIPtcq3BA5Lse6Q3ddJOKw1Ejm7gfMiZFzP7GvetDHO0PssdyFwVmA4SugaO
+4W6N/y9uOCGOF4zmLULq1Sv+q1WH3hVCkSjjn2rH0rISrCjz8cfiM4wsxpU/0sDU
+cYykyHo7j4GC9QI/ECHdiFSZXJ93N9Lp9iRI9lHV8y8Sfh1AmCJmwKE3t0DBVVTi
+HwneSxJpuTklvOriLHSxMAn/V7ZFvV/TSQR7xdXkgXZJhJUftlefxcUBwuGn+XQj
+Uhpx5m8cQYswVoaIr9cVjmG4QDuoJbnoUQIDAQAB
+-----END RSA PUBLIC KEY-----
From abbc54eeb712d13f3cdfa09c203a8f6bd6033790 Mon Sep 17 00:00:00 2001
From: bodems <bodems@wopr>
Date: Thu, 21 May 2015 17:50:37 +0000
Subject: [PATCH 58/96] removed bielefeld4
---
hosts/bielefeld4 | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 hosts/bielefeld4
diff --git a/hosts/bielefeld4 b/hosts/bielefeld4
deleted file mode 100644
index 1a60112..0000000
--- a/hosts/bielefeld4
+++ /dev/null
@@ -1,12 +0,0 @@
-Address = vpn4.freifunk-bielefeld.de
-Port = 655
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAvOJHnI0VCn4ZOVitzitHPHpxHesW4TYf7QafYU6ClQy/Sy9WN5Eg
-lrfszpwZmzABnJZ7T7BQN8j91neKwzj10qr6ppLCDavP0nqQ0CJ+Bg7SCc6HJbsQ
-aDTU1lvNcGKKPD+KchSNxUkOBZjZavVw01taztEnYy6hUy/ml8vdLTUjBBPMUQ0+
-rTe5m/rjPim5J4Eo56kRoJ2TQ3bRNZwTAgV07NAosO5V1qUncPoYsMmS6RrbBVxj
-q7UOEyegBrsFF0F5tdK/itvZIWD2T/0DlDUqoPmfh2j+urbzYwAw9VBc1+4DByfS
-Unn0cQ8AccXTDtMWQVOrLxIhm0JCmiDi6wIDAQAB
------END RSA PUBLIC KEY-----
-
From e0daaa7f4176d5ae06a9f228be2fb4cb9d3a578d Mon Sep 17 00:00:00 2001
From: bodems <bodems@wopr>
Date: Thu, 21 May 2015 17:50:54 +0000
Subject: [PATCH 59/96] added bielefeld6
---
hosts/bielefeld6 | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 hosts/bielefeld6
diff --git a/hosts/bielefeld6 b/hosts/bielefeld6
new file mode 100644
index 0000000..e56f24c
--- /dev/null
+++ b/hosts/bielefeld6
@@ -0,0 +1,12 @@
+Address = vpn6.freifunk-bielefeld.de
+Port = 655
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAwzVXJJ1/BjwV4SgXxfCJ1xpYp7mrioNBbCk9ea+J5oZs79GM3Jqo
+BHuW8QxL/x75OskFAHAlVrlLGZzoE6RtlvzIqiKesVcOuSskyt0E7r+wqltSxu4N
+tbyDRVUOkAHTwQ0zEPMPy1HJhD8SmA3m4oHPjGYdAAQztrKB2CSnP/2P29lxllLr
+OPcQt6/UN1/OcbuzHnrPSOFGxyb4Ir2FRWxiCRGjqI3QQ/ci2wfEnKsqaG/OH5nr
+gojUGkx6XT9L5Rp5cP+Xdiwr+k7J6Snnx7ZEdpdVW43sfzjJinrR1Kp4w+NgE3XS
+FFevHmSj5pMO+YHYucDKepreqSgHqwexvQIDAQAB
+-----END RSA PUBLIC KEY-----
+
From 6e1a4677b1ffedb473d0f307b5d2f41e3f13e6b3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Fri, 22 May 2015 18:29:54 +0200
Subject: [PATCH 60/96] remove diac24
---
hosts/diac24_sbc | 6 ------
hosts/diac24_sbz | 6 ------
2 files changed, 12 deletions(-)
delete mode 100644 hosts/diac24_sbc
delete mode 100644 hosts/diac24_sbz
diff --git a/hosts/diac24_sbc b/hosts/diac24_sbc
deleted file mode 100644
index 0c0fdae..0000000
--- a/hosts/diac24_sbc
+++ /dev/null
@@ -1,6 +0,0 @@
-Address = sbz.icvpn.diac24.net
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAN8O1i0kkDsktLuFbL01x/Mj47KtTMQUm373NthJoYeuxh7Uc8eud0E3
-FoZBcMCn7LKRvLh8HH83re+SAeplZ5nFqYLBEIZtonhRlP+bnIQDjGCwTaXXp2ew
-m8ZAPA1TPRl6e3ZzJw7CvGZrsiKfwwNUaEp/AIrdJ3p55fUehiFNAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/diac24_sbz b/hosts/diac24_sbz
deleted file mode 100644
index 0c0fdae..0000000
--- a/hosts/diac24_sbz
+++ /dev/null
@@ -1,6 +0,0 @@
-Address = sbz.icvpn.diac24.net
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAN8O1i0kkDsktLuFbL01x/Mj47KtTMQUm373NthJoYeuxh7Uc8eud0E3
-FoZBcMCn7LKRvLh8HH83re+SAeplZ5nFqYLBEIZtonhRlP+bnIQDjGCwTaXXp2ew
-m8ZAPA1TPRl6e3ZzJw7CvGZrsiKfwwNUaEp/AIrdJ3p55fUehiFNAgMBAAE=
------END RSA PUBLIC KEY-----
From 66cccc539526871b558d7a513244f29d2e97a529 Mon Sep 17 00:00:00 2001
From: Freifunk Harz <technik@harz.freifunk.net>
Date: Sat, 23 May 2015 13:29:23 +0200
Subject: [PATCH 61/96] Add first gateway for Freifunk Harz
---
hosts/harz1 | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 hosts/harz1
diff --git a/hosts/harz1 b/hosts/harz1
new file mode 100644
index 0000000..a221d5c
--- /dev/null
+++ b/hosts/harz1
@@ -0,0 +1,12 @@
+Address = 88.198.40.100
+Port = 656
+
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA85ZQazOKLgIsyh8ajrcq6OTxU3TAT11L5Sz7gGMwtQxBQAGNHw7E
+V7vbS4TjWzOkiNzPC84GWkGOSsnaf6qLFT2ELoOFfTSPojNLKI9h5vENwkCX/aha
+B/wnPnVesp/K+ihPOWHfEAb1Kuu3gYsi3Xq4Bv+5dPl7aW13+aHjgCCHRDZ3eKRo
+eDfk0mDhQAtUPhfQG5uH/PGiv4dE+e/NQx59ame3YmQGaos4mfjhkZ+3r/Xa2qZF
+TvVd/7eGMzyvuNgnh/ygaGyTy3OLbDhxR68aunr/CYY/ekbO/whcEhuVjiYYa4Qw
+wrW/zBmZxyWfW6SCXXt+Z5xG0vDcuIrzBwIDAQAB
+-----END RSA PUBLIC KEY-----
From 4e2a0284f70b9b0b8efdeee04976e87213af97ef Mon Sep 17 00:00:00 2001
From: srauscher <rauscher-ff3l@t-online.de>
Date: Sun, 24 May 2015 14:55:54 +0200
Subject: [PATCH 62/96] Remove dreilaendereck3
---
hosts/dreilaendereck3 | 11 -----------
1 file changed, 11 deletions(-)
delete mode 100644 hosts/dreilaendereck3
diff --git a/hosts/dreilaendereck3 b/hosts/dreilaendereck3
deleted file mode 100644
index bf28c61..0000000
--- a/hosts/dreilaendereck3
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = gw3.freifunk-3laendereck.de
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAriAC3ChanNKtXgp/Eu0EcTJTeAM8yp1D35SOM89hVgygYmy4woC0
-CEx6SbVFnwzL4Rar4+c4XXCDLq74AsHjTe7ulzvSDJ/acSoOVsXZ0Wnb5QUFYDlL
-ue/2dp9TNHNRl/27OjBL+5fQM4LBvdImBJFKxuYtJc5ApB12LAIAx2y5FS0mp2rT
-k2+HDZgaxanlUf6ecaFp8H7A5LiITig8nHUa9/0J5U5Q4ZzYoSnjQKiOKvaOWKX/
-RydUCrZyiyVl12tlEc/FcT//zj7XrNE8oHC9LaUWb6masCCzv0WR5Ck5XX3yC+/m
-gsvjMK7c1I/tFjUQE07MO68qXCX2zzV14QIDAQAB
------END RSA PUBLIC KEY-----
From 200f9c03a2993f9ad52f2932167d5646ad85ddd8 Mon Sep 17 00:00:00 2001
From: wasserfloh <wasserfloh@freifunk-mwu.de>
Date: Tue, 16 Jun 2015 21:29:46 +0200
Subject: [PATCH 63/96] Added mainz1
---
hosts/mainz1 | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 hosts/mainz1
diff --git a/hosts/mainz1 b/hosts/mainz1
new file mode 100644
index 0000000..75cc893
--- /dev/null
+++ b/hosts/mainz1
@@ -0,0 +1,10 @@
+Address = ic-mainz1.freifunk-mainz.de
+Port = 10655
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA1M84cHK5ok4qCghUrmtSRHv5EvzMV4XypivUv5b4wac3stusEhc0
+Wj3PgWrQjQMHjQWnOii/EcMUvRXD6pT3jZCGBOd/BHFherlmJUV8TgSjvABIbzmJ
+vAyfICn6brdYVf6D+eJwQ43I2e/7hbB80Y6e0zbBo4hvc2AuiI8ipof61kdJZden
+/F3+hq904rgX17P1bvJFtJcO80bNeYj0xl2LcribCZaMIjlDnHV883Pg/+rqrV7v
+rBKfPlNHuA6ewYGPyKVadkyJuMsw1M4dY/Go2cPupQyBeybulj+43c1QZwXdg/z5
+za/FIE1bG3DiJS0EmPPZkrejZz7VLimXyQIDAQAB
+-----END RSA PUBLIC KEY-----
From 065cd5ddf2b315c1a3f7f8cc571cfcb0e4de18ee Mon Sep 17 00:00:00 2001
From: Matthias <freifunk@3dfxatwork.de>
Date: Tue, 16 Jun 2015 22:20:56 +0200
Subject: [PATCH 64/96] update halle hostnames
---
hosts/halle1 | 2 +-
hosts/halle2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hosts/halle1 b/hosts/halle1
index 0cb00eb..fc21ee7 100644
--- a/hosts/halle1
+++ b/hosts/halle1
@@ -1,4 +1,4 @@
-# Address = ffvpn.3dfxatwork.de
+# Address = icvpn1.freifunk-halle.org
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsYzXhlTKxR7YBUXHY0JscmtNbrFzZzviVzIhpuml499rh8TVhjMU
ozyjbaPhSUy+9RY4F1WpRmDi3lyDx7eT0viRlOkFG8huApXEgGLQgah0M/pfwkc1
diff --git a/hosts/halle2 b/hosts/halle2
index e15833c..469f77c 100644
--- a/hosts/halle2
+++ b/hosts/halle2
@@ -1,4 +1,4 @@
-#Address = ffvpn2.3dfxatwork.de
+#Address = icvpn2.freifunk-halle.org
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA0F40mEg2vW9emNFi/Sr10rN4d/+O6VGLKjHGfMtUXxM9xILBlbDt
Tid/mB5eOJu6CjXxLAlxrx0Ppm49jooD0BJz/Ajk7Xr2FX1pDxCAxwBBGj2iruy4
From 4b7ee4a595ccac7320e540fd05c7b80fe1aead88 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Sat, 27 Jun 2015 23:33:36 +0200
Subject: [PATCH 65/96] darmstadt2: add ed25519 public key
---
hosts/darmstadt2 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hosts/darmstadt2 b/hosts/darmstadt2
index 535dcf9..9c8a2e6 100644
--- a/hosts/darmstadt2
+++ b/hosts/darmstadt2
@@ -8,3 +8,5 @@ RW9lc+6XTrDv3I6XdNTe0Nj9XRkdoUxzJXQfLHLUx/ynymD7w1325cf5JAVTW8YK
gZvUSZ+irwenMIc+qTv00z8THPQaB0wMoOfgEe8cA85sBxkAj8cOMzoiuUxjgk7/
WSejxCFFpXe6uXLtdWKNAPWoYUq3EXNqrwIDAQAB
-----END RSA PUBLIC KEY-----
+Ed25519PublicKey = OpGqPZB8LMeTamFWVz/h1y5CBnD8al35G2f3u+0hxMP
+
From 136bf6f61d6045b892fc24f516241ea0d3874e41 Mon Sep 17 00:00:00 2001
From: FFMee <beda@meerane.freifunk.net>
Date: Thu, 2 Jul 2015 23:31:51 +0200
Subject: [PATCH 66/96] fixed typo
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 7849425..80c3a70 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Hint: In version 1.1 this option was moved to the tinc binary and is called <cod
### Execute post-merge hook
This step is necessary to populate your new configuration with infos about the metanodes.
- # ./git/hooks/post-merge
+ # ./.git/hooks/post-merge
### Set up a cronjob to update the repository in regular intervals.
From 35d1c7da5454f78a2ade6fc693e3f01d269b138e Mon Sep 17 00:00:00 2001
From: FFMee <beda@meerane.freifunk.net>
Date: Thu, 2 Jul 2015 23:40:49 +0200
Subject: [PATCH 67/96] a new friend for the cloud
---
hosts/meerane1 | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 hosts/meerane1
diff --git a/hosts/meerane1 b/hosts/meerane1
new file mode 100644
index 0000000..e1dabdd
--- /dev/null
+++ b/hosts/meerane1
@@ -0,0 +1,9 @@
+Address = ffmeeic10.meerane.freifunk.net
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAym1/4gwwOUaCuUAee+JD0yPVSNbhVwJDkroqpcnSRDh6Zvyl/jTe
+Xc/qB0eIba8EnuskBggF+Zkqfob9C0O+AxwxKMlv5tnR7XKS4/CYRoW5jKRkxDn6
+ObZC/DbizbNE3ZmbAdztdCBp8txhuog889xYx0gK/Xe8g5ICFkr7l5yyn2dxZDvp
+Eqbi+b9fWalWTtyXwGio1WU+8EgnMG6P6re6kKIsCezR0vbHo661iG1MgV3B8liy
+4zclS5bdukRBpuIU4BXW4dSJkXSbBFsOFxkPlgrZCpkxbFDQ0/awwgZ8nFE+Y3IR
+hFQp+qR37FGFAjgo31CYNn2oLhJ3gjL8eQIDAQAB
+-----END RSA PUBLIC KEY-----
From cb695a88f29a06085d6b83a254a545e238143848 Mon Sep 17 00:00:00 2001
From: root <root@v22015062772125788.yourvserver.net>
Date: Sun, 5 Jul 2015 13:03:37 +0200
Subject: [PATCH 68/96] add gl2
---
hosts/gl2 | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 hosts/gl2
diff --git a/hosts/gl2 b/hosts/gl2
new file mode 100644
index 0000000..6303d41
--- /dev/null
+++ b/hosts/gl2
@@ -0,0 +1,12 @@
+Address = 5.45.100.14
+Port = 656
+
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAubNEotpkRAKFlm2WtgOr7Xx8ZzUca7VkhqPAh/QprEBNdupViMvk
+tKZdzHasvJQO0t5BmHZ8HAuQlKoHaagp5zEc5P8oGP+TS9A/QKwL/YyOXYoQ3Zx6
+edIXn5EJTXoCfM+q2DdS65HAQhSyuM3PJ0SoC85rStQfRBaShuF4oBlFEaKg4yYs
+dTKlpM5ZEQLT7GVOF7dSpTyV6trpk05TfMZf2qWGRJU08/XOh5OzQH+TTDMTbbd0
+kn8BUFrH76vriOYma6kay8WN+egiNJhgfne8iOSPKPX0yzkPHA214wk3+1pmMcu/
+3Mu9habpoGFF0G1NSGwaQ5147QEhCt4pYQIDAQAB
+-----END RSA PUBLIC KEY-----
From c15fe1d5aadc2775ddf06b411941da0c4b08cfc7 Mon Sep 17 00:00:00 2001
From: Georg von Zengen <oni303@gmail.com>
Date: Tue, 7 Jul 2015 21:59:14 +0200
Subject: [PATCH 69/96] changed icvpn gateway
---
hosts/braunschweig1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/braunschweig1 b/hosts/braunschweig1
index 7fbe162..5867751 100644
--- a/hosts/braunschweig1
+++ b/hosts/braunschweig1
@@ -1,4 +1,4 @@
-Address = gw1.freifunk-bs.de
+Address = gw3.freifunk-bs.de
Port = 655
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA1SlHQTdW8wnYWpSRwZWx5BHOHm+0WzZNN96edmUqAi5hrVQwVCeI
From 503887d06f837bf457b518c38ac0cb567c8fd0e2 Mon Sep 17 00:00:00 2001
From: Sven Reissmann <sven@0x80.io>
Date: Wed, 15 Jul 2015 22:25:09 +0200
Subject: [PATCH 70/96] Changed key for fulda1
---
hosts/fulda1 | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/hosts/fulda1 b/hosts/fulda1
index d9358ee..795e45c 100644
--- a/hosts/fulda1
+++ b/hosts/fulda1
@@ -1,15 +1,15 @@
-Address = gw03.freifunk-fulda.de
+Address = gw03.fulda.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEAw97CxdW9jjI6gHExRsls5rCJ9mt2FW4jLg6AiUAlcKo6gJkAK7dn
-TK72ckMBoFc0oQTqOAMtdxPGdkojqy9jfOGRnJrEPru8zfHaL2AHEy3BO8DTdt6P
-43UB5dxymfEcaLi/5lMyjuwX1AwnWZwh3yHhUjjSIRo2f8Ph6iiVWOOCcTTv4YGb
-8ODSNjtsmDtAv9Ejj4+GJaMAtKn2KP0u73C2ix169nUtfIdRN9OCx50ZHig8GVqZ
-LwWK0zDpOStlgNaBhCne8LO8yHnMyimrNIBRORNFR04YtUt0ubiZqjLm14wFLe0t
-zJqqquOXA7Es2ztvX5PP+xhyPv9N8hd5t4kg/2OExkZZ4JVN8Npb1bNQurEon38a
-RFnbKSKXxrN2UGwJLKrJa3GkXCrFVn1M+/XnQkT2VjkaPYjOPDNr6j2oUj07/mAS
-Xs74TBDIk+Re1xmUsuehzBd9CfhnWJCc/JOgZuLeWThm0RccOCFFRBLz92QFzVnZ
-NXVGTLktNMGnMdDZ0EjLoXQzWQRJEJ4gSeQRfsFYFvMk9qPwRoXB1pMHSckNoSxK
-4Bfwl+md6eF9g74aGQ0JrhO+mpUcSrEWbh0w4W4jhU7UuTxxAwKrHBYt77012QrQ
-g0L07Z1lY4DB1FWXkkJ7VWI0rUJpCzUKJH34kQGhJ771Rwq0TGAli70CAwEAAQ==
+MIICCgKCAgEAwKn26rKjqkFTPXm/aWVEw/oc2GsurG2YLGs1Lf7cD+zc7KFS3+lR
+U5KKR96EE7+5qxZ+NCqWQIcA7fvPoLRrgc1jNRULSi7USsWI1kPlOac0hdd0mId9
+4XHZpQWuLewQ1ETWyzfp8kPSd2eF3iIGVGSGyigpOKSjxw+vPB7OFjfkdIto5+Jt
+u+62Px/i0i7uLyfW2l8eB8Hf///Ca8RA4LhaPDO6MamytyBt0xSRzPH+HfFhWw8q
+TPQytXvheSSw15OjiWpgsUeoNKF4JZK/IhIcpjdmXXWFQtWEixmj5IdTOMTP8jxZ
+ihCTuQ+7UEiHjAg2/B/balAEmztJ5qMzklVaNU6gGMu9Q3ITdEK7i4hybyTf9D8H
+QIw/F+htJJ+ninuyGM/ACigk5zmUZFLZXPSeLRdYJQqiJQXsPNrsGZMmeJi0RkN3
+qx7Nu2tCGsUVKAXf+o8O4SLC0fbAqdrI4u2g3sxQO6x8nRQWCUyF2rN0N171BkQw
+O65MOII42RSCFFrXbcyVHMa4fmSSYjsQkKvrS8K8Z324cJEvRKi9gDLolSg2I2I5
+vcdrua/E8jU8kttcvo+umfNvt6XL6I4P/r06+OGqnMXfGeMMbazWze8HNM4eYYmM
+WZhK7X/m3g0NEFRa1433lJmDQ4ONUkC+3vz4N8tjY2vgiQzBciCWGs0CAwEAAQ==
-----END RSA PUBLIC KEY-----
From fc7b26d657f717fa96adf34b05eaf49eefd9a3ab Mon Sep 17 00:00:00 2001
From: Kai 'wusel' Siering <wusel+src@uu.org>
Date: Fri, 17 Jul 2015 17:50:13 +0200
Subject: [PATCH 71/96] New keys
---
hosts/gueterslohbgp1 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hosts/gueterslohbgp1 b/hosts/gueterslohbgp1
index 4e20e21..4e499a9 100644
--- a/hosts/gueterslohbgp1
+++ b/hosts/gueterslohbgp1
@@ -1,10 +1,10 @@
Address = bgp1.guetersloh.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA9lK5No/IuY3o2NaIklnwYD/lHtHG4Qs6qjBGGrOmVJ1N2UsQRwVr
-kbO5pi7sn6dX2xojn4u6WYDIXGdOEihlxdJ7SIgcfjlBSSkSlc73E4MAgG46tOSp
-SdAKhllN2J614Mng2TWQ8SmQ0xMSR80FiJkwMnZ8pb4nUAr5kMiplzxZAxLrUyJG
-0exDuKTPG6fKKIDKBXgO7gbUMbhGRpduo7BSS2VJ9SxtuVgI7Cs/d0O06f9L9Iq9
-krxzb42OHJk9pEQY8EB8jFQFiEdL7ShjXnJ+H5SeUyFX9bJZKyOYzAawwMWmkDK5
-Xm+6ZUW4XoMFWxJ79hLHu0oWxTcWWWGX8QIDAQAB
+MIIBCgKCAQEAxChfHd+VNGxGtoqa48zNKTFdW0W4FdHJxxDhdCxYzPu9sUe6yJHj
+bkDBnJW3JpOydqTsMfNk8Q7a9eltldutv6cg38cDzaQoclXPSSPdZVRBhm+tb5ks
+DojJMtBmMS0QwZHfvHpQPC9VYGg3CBwA+6T9IebwECg2sYXfK+qOu/u4VfIrmBsd
+Seami+PYK0IyDeWIrtHJdGM/XEMzOj8G7i4mOds8Ci+R/+8+rH8gOkbyWcdXQH7r
+rnHShwUSgyVqP+lHhZZn9tNf/1+4LnsGumc5KvAVQAPoc8jIgd9JO9FDJpsVnYg0
+parf3RCJnWDO0QPBRnJSdgJ78j13yv2NuwIDAQAB
-----END RSA PUBLIC KEY-----
From e22c76a4821009ce5c4586273b16be164f63ebb6 Mon Sep 17 00:00:00 2001
From: Kai 'wusel' Siering <wusel+src@uu.org>
Date: Fri, 17 Jul 2015 17:54:26 +0200
Subject: [PATCH 72/96] Revert "New keys". Should have been a pull request,
sorry.
This reverts commit fc7b26d657f717fa96adf34b05eaf49eefd9a3ab.
---
hosts/gueterslohbgp1 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hosts/gueterslohbgp1 b/hosts/gueterslohbgp1
index 4e499a9..4e20e21 100644
--- a/hosts/gueterslohbgp1
+++ b/hosts/gueterslohbgp1
@@ -1,10 +1,10 @@
Address = bgp1.guetersloh.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAxChfHd+VNGxGtoqa48zNKTFdW0W4FdHJxxDhdCxYzPu9sUe6yJHj
-bkDBnJW3JpOydqTsMfNk8Q7a9eltldutv6cg38cDzaQoclXPSSPdZVRBhm+tb5ks
-DojJMtBmMS0QwZHfvHpQPC9VYGg3CBwA+6T9IebwECg2sYXfK+qOu/u4VfIrmBsd
-Seami+PYK0IyDeWIrtHJdGM/XEMzOj8G7i4mOds8Ci+R/+8+rH8gOkbyWcdXQH7r
-rnHShwUSgyVqP+lHhZZn9tNf/1+4LnsGumc5KvAVQAPoc8jIgd9JO9FDJpsVnYg0
-parf3RCJnWDO0QPBRnJSdgJ78j13yv2NuwIDAQAB
+MIIBCgKCAQEA9lK5No/IuY3o2NaIklnwYD/lHtHG4Qs6qjBGGrOmVJ1N2UsQRwVr
+kbO5pi7sn6dX2xojn4u6WYDIXGdOEihlxdJ7SIgcfjlBSSkSlc73E4MAgG46tOSp
+SdAKhllN2J614Mng2TWQ8SmQ0xMSR80FiJkwMnZ8pb4nUAr5kMiplzxZAxLrUyJG
+0exDuKTPG6fKKIDKBXgO7gbUMbhGRpduo7BSS2VJ9SxtuVgI7Cs/d0O06f9L9Iq9
+krxzb42OHJk9pEQY8EB8jFQFiEdL7ShjXnJ+H5SeUyFX9bJZKyOYzAawwMWmkDK5
+Xm+6ZUW4XoMFWxJ79hLHu0oWxTcWWWGX8QIDAQAB
-----END RSA PUBLIC KEY-----
From 4b4dff9788ee0aff3be53c08e2b0963e3d7dcceb Mon Sep 17 00:00:00 2001
From: Kai 'wusel' Siering <wusel+src@uu.org>
Date: Fri, 17 Jul 2015 18:04:26 +0200
Subject: [PATCH 73/96] New keys for gueterslohbgp1
---
hosts/gueterslohbgp1 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hosts/gueterslohbgp1 b/hosts/gueterslohbgp1
index 4e20e21..4e499a9 100644
--- a/hosts/gueterslohbgp1
+++ b/hosts/gueterslohbgp1
@@ -1,10 +1,10 @@
Address = bgp1.guetersloh.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA9lK5No/IuY3o2NaIklnwYD/lHtHG4Qs6qjBGGrOmVJ1N2UsQRwVr
-kbO5pi7sn6dX2xojn4u6WYDIXGdOEihlxdJ7SIgcfjlBSSkSlc73E4MAgG46tOSp
-SdAKhllN2J614Mng2TWQ8SmQ0xMSR80FiJkwMnZ8pb4nUAr5kMiplzxZAxLrUyJG
-0exDuKTPG6fKKIDKBXgO7gbUMbhGRpduo7BSS2VJ9SxtuVgI7Cs/d0O06f9L9Iq9
-krxzb42OHJk9pEQY8EB8jFQFiEdL7ShjXnJ+H5SeUyFX9bJZKyOYzAawwMWmkDK5
-Xm+6ZUW4XoMFWxJ79hLHu0oWxTcWWWGX8QIDAQAB
+MIIBCgKCAQEAxChfHd+VNGxGtoqa48zNKTFdW0W4FdHJxxDhdCxYzPu9sUe6yJHj
+bkDBnJW3JpOydqTsMfNk8Q7a9eltldutv6cg38cDzaQoclXPSSPdZVRBhm+tb5ks
+DojJMtBmMS0QwZHfvHpQPC9VYGg3CBwA+6T9IebwECg2sYXfK+qOu/u4VfIrmBsd
+Seami+PYK0IyDeWIrtHJdGM/XEMzOj8G7i4mOds8Ci+R/+8+rH8gOkbyWcdXQH7r
+rnHShwUSgyVqP+lHhZZn9tNf/1+4LnsGumc5KvAVQAPoc8jIgd9JO9FDJpsVnYg0
+parf3RCJnWDO0QPBRnJSdgJ78j13yv2NuwIDAQAB
-----END RSA PUBLIC KEY-----
From 413eeba4620d25c883241fd5bce9b17a6c3f5074 Mon Sep 17 00:00:00 2001
From: Freifunk Uelzen <FreifunkUE@users.noreply.github.com>
Date: Sat, 25 Jul 2015 14:15:31 +0200
Subject: [PATCH 74/96] Create uelzen1
---
hosts/uelzen1 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/uelzen1
diff --git a/hosts/uelzen1 b/hosts/uelzen1
new file mode 100644
index 0000000..53a911c
--- /dev/null
+++ b/hosts/uelzen1
@@ -0,0 +1,11 @@
+Address = uegw1.freifunk-uelzen.de
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAtU1/lyX5TBRpy/DeHucVDL+SrUqEbNqpeIYzTBsb/Z4/7qap9W/9
+AJDyIwQGFX4Yu8U3POl0tJmjbnBspsh5FFOHkkpgII7jeUy0/7085+W8HtQwnRDA
+xYosgMMLOzmpBhxwOr/tIG+HmlFHYdQQm251CIB8XxZmIbyMj7A694tAbuYdRnnt
+++CUj31+GXsKQbJKKAPuv8t88KFP14FX70mavfDBTvgCGNibs5elx12CtEGxSGoz
+IPaEf03iwOzx1QfV1uKyri/wEj49ELEn5MeZFK+BziaZjVGQ0GMcktGIx2ovB7ad
+NGOxp3gJDmkQmfmtV/uRP7KbGl4IMQVx8wIDAQAB
+-----END RSA PUBLIC KEY-----
From 6c9e7b0a555fc7f6456e9161d8adb2d8cc360e87 Mon Sep 17 00:00:00 2001
From: david noelte <dnoelte@gmail.com>
Date: Fri, 31 Jul 2015 21:09:24 +0200
Subject: [PATCH 75/96] added waldheim1
---
hosts/waldheim1 | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 hosts/waldheim1
diff --git a/hosts/waldheim1 b/hosts/waldheim1
new file mode 100644
index 0000000..3227689
--- /dev/null
+++ b/hosts/waldheim1
@@ -0,0 +1,9 @@
+Address = vpn01.freifunk-waldheim.de
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA+DamB7iSwBw17Rj5MllCedVBP/7LkfJ7zPiaMtjjns3YFdDJQrlq
+Tsr5JmiWz4ijSt17vc9s2Qy5ZZ/JBBAV8SAA8riQoeqcy0YZx2jXi1FOxYaZD5r4
+7ylvr8B+tjc+1ajTvKrmoQfP607763UuTU7VlC4DKrrddH7iiYiOOmCmq27Smr97
+6vZBREE/bB+qTfAvmzvxPKHTM+LlWlsRatLHQvdji0j9RW2Q4gVIEB4nc6YeHzUw
+UL8Hbo+LheP/EUBcZqinoIHcdZ2OvyehImYjLi0MvU7FsWdfHmwHcSJJUp7VpToq
+CpLAQ6zf6QF7jOQjtPjJcQQlW9MwopLMUwIDAQAB
+-----END RSA PUBLIC KEY-----
From e5d0c78b01abfa983f9a7e1ad9eebca695eb0c5f Mon Sep 17 00:00:00 2001
From: david noelte <dnoelte@gmail.com>
Date: Mon, 3 Aug 2015 00:11:53 +0200
Subject: [PATCH 76/96] added waldheim2
---
hosts/waldheim2 | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 hosts/waldheim2
diff --git a/hosts/waldheim2 b/hosts/waldheim2
new file mode 100644
index 0000000..baf489a
--- /dev/null
+++ b/hosts/waldheim2
@@ -0,0 +1,10 @@
+Address = vpn02.freifunk-waldheim.de
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA6JPQIdk9Ce6g3cLlEHKlEFed5UuSSlNIavM+i7ePW4wpjyVSd1Ib
+1L57lJhyDjeoYWuV45vQZSalUIyuThx93m5Xd1K0sf3smO5U5s7wOv7Zu5xNHSWi
+s5IvTvhkBCcqmVYI2xmlb9kFyEs+IuCRftzKdqnfreMbZKV0w2XmTur/KfN0xBlu
+7A9b8ncn1ENY19aVTdr0DkUS8nf3CoP2c8tr2+cGHumTdKlq4jW8+QoJ7hRzxnd3
+bppQ0Ox+UF24jQVP+8UOAfJtQtw0bMVfw5BFeOLic1GDjitWDliWXfrOQgKLKRFH
++32usGFXS4YQZ7n1Zq4xbjNwTARTETmgRQIDAQAB
+-----END RSA PUBLIC KEY-----
+
From 566b212f74a32904885297d059b9aaedbff83c68 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Mon, 3 Aug 2015 01:08:27 +0200
Subject: [PATCH 77/96] check: ignore ed25519publickey keys
---
scripts/check | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/check b/scripts/check
index dc7235b..6836bad 100755
--- a/scripts/check
+++ b/scripts/check
@@ -128,7 +128,7 @@ def get_hosts_data(srcdir):
error("non-integer port given")
else:
addresses.append((v, None))
- elif k in ('ecdsapublickey'):
+ elif k in ('ecdsapublickey', 'ed25519publickey'):
continue
else:
error("unknown key {key} with value {val}"
From ea7fc83156d538b8c77cc8576243aae243e9623f Mon Sep 17 00:00:00 2001
From: kaleng <kaleng@gokk.de>
Date: Mon, 3 Aug 2015 01:48:22 +0200
Subject: [PATCH 78/96] Delete koeln1
No maintainer available.
---
hosts/koeln1 | 16 ----------------
1 file changed, 16 deletions(-)
delete mode 100644 hosts/koeln1
diff --git a/hosts/koeln1 b/hosts/koeln1
deleted file mode 100644
index b695e20..0000000
--- a/hosts/koeln1
+++ /dev/null
@@ -1,16 +0,0 @@
-# Address = fastd3.kbu.freifunk.net
-# Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEAwzH7Z0W0yIDp80G8sHpaxez7GXL3Lql7DAdJkrNf6KEzZAsZ7usn
-9g6OoO5wQIWkBlEyGWGiCEIbGOHUQ7WjQwCkqO8Lfk6pJzheTjrRx7Sw/jd2aJwc
-szZG/DN3T7Mt1BoYHqT+Q+SyoAgIggoCDYQMaRMwBJkb4c8MmHDEEW7tmJFip+NQ
-5xv4BVGJBtWEkVhpVdLv6IQOB9jE1Jzpr8hlXDgNGqgKTAhK+dUtmpcwTRNyZok5
-0GZimewroF76FTy7bqiLJK2iotMw5SHbut3agaS7BTEggEkNeTzLq1p2YIf5lVr1
-ctTqkgiIALjiccnVhoWOwL9Rk+HB4O8s8qpK4cnLTHIkLWfLFLiuYkkENWMjiM68
-NVWbIkxMMujFKj3edNb/FD7vcdQ3kT5yoVwqTKP8UdboU4W+0LeLWCl3dOIF+gzz
-57i8R4tugDUKms44L97Pt7ArjF8CRrFp43lV5LRxKTw6EeqU5BgMUyRXI2qF4d4W
-EOQIMOX0v6P55zKeNKNm7iSNroqWeMA4wje0N4CsUir+GSQNFvmC3j0RypChcnmo
-WHxCvnI1BMRv5m1PyxCibeiBlXSYqV66P8+XtSTWaAnnGH5scj/d3zO9fElqPepl
-lQi16kmvex7I8S66jGh+MExIbEvvxJNyPaBQ4CN+kCujaj86dtz1W9cCAwEAAQ==
------END RSA PUBLIC KEY-----
From 4c6a3ddff7466a8f2f682a0e847b71c13a8f08ed Mon Sep 17 00:00:00 2001
From: anon6789 <anon6789@crater.uberspace.de>
Date: Tue, 4 Aug 2015 21:35:57 +0200
Subject: [PATCH 79/96] add vpn05.bremen.freifunk.net
---
hosts/bremen5 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/bremen5
diff --git a/hosts/bremen5 b/hosts/bremen5
new file mode 100644
index 0000000..74c8b32
--- /dev/null
+++ b/hosts/bremen5
@@ -0,0 +1,11 @@
+Address = vpn05.bremen.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAyMFsxTq0jV63n3m3miKKCfW3NtDiUgY7P8piZWZIudx4/PFr96px
+M2OlB5H6g70Fj6MiSFZ9Hnb2mtBjhT7bBBfMnBl1WNeH6vUJh0vQ1G02cQDJkPzd
+Ir9djg2jFDkh3NkA/gt0ZbQiqFXAdbLfU8wJvDUe35hocU7K+4y4ZQ9G95zmh62c
+wmiAZoQmZHZBZaeMyACMtnEncY4onefJrK973+5W2LguSIzbpohyOCmtZaSy/3ei
+oxzNvQW4mmJz3f4+dbJ1FEwTRdgfvIPIDT42UgZAQQLn8+iXOf45ghCOi7ef4ZLb
+pdEHfufyIHaJX95hOedbmtJCOHc12nT3qQIDAQAB
+-----END RSA PUBLIC KEY-----
From b4b204ad411242efdd5952bdba545000201098d0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Wed, 5 Aug 2015 04:46:28 +0200
Subject: [PATCH 80/96] remove obviously inactive tinc hosts, that...
a) have never been seen by tinc on darmstadt2 (metanode)
b) have not had an active address in month
c) have become inactive
---
hosts/bayreuth1 | 10 ----------
hosts/franken1 | 6 ------
hosts/franken2 | 7 -------
hosts/franken3 | 7 -------
hosts/freiburg1 | 7 -------
5 files changed, 37 deletions(-)
delete mode 100644 hosts/bayreuth1
delete mode 100644 hosts/franken1
delete mode 100644 hosts/franken2
delete mode 100644 hosts/franken3
delete mode 100644 hosts/freiburg1
diff --git a/hosts/bayreuth1 b/hosts/bayreuth1
deleted file mode 100644
index dd3c88f..0000000
--- a/hosts/bayreuth1
+++ /dev/null
@@ -1,10 +0,0 @@
-# Address = freifunk-bt.criede.de
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAppgeP431r3K4cgy9s1XUB/+SEb9F64Y9q34jxjwRssIaFx+mtukr
-JDLFtRNNTi7ao+kL3s1OBhavCeKwYSFAlaQnIm7fLwKwhJiIZwnKVM26SJPUwPfP
-pQZkEv8e5boFCEhsSGcLGLineG/TUDYa1cfwKL0kUc7KiTczm/2w5FQhiqUEc/Cj
-espO57hhzoI6Ian1PIFXjpRceTRvrBxFyg5p6uNRGENa3o0Ixf2u3MT2DuCAzbW8
-ndAsnqUz3uggc1scoy4/mMoFDEXfWkF6wbnpNAwEpnaDDgMI1eUgivuphiJOkqcW
-C3hHDdGbYQ+zKqukqvGjcKTbMjLzOLnL+wIDAQAB
------END RSA PUBLIC KEY-----
-
diff --git a/hosts/franken1 b/hosts/franken1
deleted file mode 100644
index 6c17f03..0000000
--- a/hosts/franken1
+++ /dev/null
@@ -1,6 +0,0 @@
-Address = gw1.fffranken.de
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAL7Zdz7fpxIkUm8hvxK0Qm+iS11d9AN1BmjLrMZU9nlUwf+NTNIX94Ng
-XV1GINi9U/RF6j35JAyt6Y2K7C3BjHM2Zl8rm2ya2lhvoKhsDJTe1x07BnhamzEs
-k0xufslEH9ZatR7FDYzKQa1qPFxLyojDymYiap+L/7QD+Q8eU+dFAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/franken2 b/hosts/franken2
deleted file mode 100644
index 7a64878..0000000
--- a/hosts/franken2
+++ /dev/null
@@ -1,7 +0,0 @@
-# Address = gw2.fffranken.de
-# Port = 656
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAOvt5phPFC+/KUvmGWJdNfIoPWuHfJb0na25VteGQDUMn0krudoIJQFb
-snELlAl5emnNbH7W5NWGKfjl7fMRC8RJ7r9eb1/jjsRlDK6aRnN8hHzcCa45PCeI
-m1plGxS6SC3kI6lRB9gjXoKe4GPl+fi3F7sk6fxxIxDBQSnYFWMnAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/franken3 b/hosts/franken3
deleted file mode 100644
index 00c11e8..0000000
--- a/hosts/franken3
+++ /dev/null
@@ -1,7 +0,0 @@
-# Address = vpn3.fffranken.de
-# Port = 657
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAPIkkqmdnJi3Y+cGKslf0t+swE+7rtfRQTStW29MP62L6Sn0lxb5MufU
-LRtR0UW31SWQ03HGuUe51e16ppxZ3V1AFQvoLAwxwDD6VvBk4n+XEiupWPt+0XSd
-vNQAM3GOtMVQc6W39ZEa4PaMr44x256W+KnHgNrAL7v+62j+9nJbAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/freiburg1 b/hosts/freiburg1
deleted file mode 100644
index d88b910..0000000
--- a/hosts/freiburg1
+++ /dev/null
@@ -1,7 +0,0 @@
-# Address = port-87-193-156-225.static.qsc.de
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBALo3VfMiPxK5lxWOYqoCZavMp8Lo4HYTmhLR6w3dHDJTI+UKTNDOf3Tc
-reO0q+K85uopAtuu9yEshMxapvmijmEO9YsD+XinLNvnwNxx7qSaVQrPFTa4MutK
-OuD1fP/PyX12XOnPsjw/CecqhbkCDg8XwFtGZcOJq9Z6DPvyotvJAgMBAAE=
------END RSA PUBLIC KEY-----
-
From 41c67d6c817c72dcbeebc17264839e6f6715eea2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Fri, 7 Aug 2015 15:54:00 +0200
Subject: [PATCH 81/96] post-merge: hide stderr, when tinc cli is not found
---
scripts/gentinc.cfg.sample | 8 ---
scripts/gentinccfg | 104 -------------------------------------
scripts/post-merge | 2 +-
3 files changed, 1 insertion(+), 113 deletions(-)
delete mode 100644 scripts/gentinc.cfg.sample
delete mode 100755 scripts/gentinccfg
diff --git a/scripts/gentinc.cfg.sample b/scripts/gentinc.cfg.sample
deleted file mode 100644
index 355009e..0000000
--- a/scripts/gentinc.cfg.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-SVN_DIR="/mnt/data/freifunk-icvpn"
-TMP="/tmp"
-TINC_DIR="/etc/tinc/icvpn"
-TINC_INIT="/etc/init.d/tinc"
-SVN="/usr/bin/svn"
-LOCKDIR="/var/run/gentinccfg"
-SVN_USERNAME=freifunk
-SVN_PASSWORD=freifunk
diff --git a/scripts/gentinccfg b/scripts/gentinccfg
deleted file mode 100755
index 05057d2..0000000
--- a/scripts/gentinccfg
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-#
-#==========================================================================
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#==========================================================================
-#
-set -ix
-# HOW TO USE
-# * Check out the icvpn svn tree to the place where $SVN_DIR points to.
-# You can do this by running:
-# mkdir -p /mnt/data
-# svn co https://kdserv.dyndns.org/svn/christof-icvpn icvpn
-# Use "freifunk" as username as well as password.
-# * create a /etc/gentinc.cfg file with the following content (remove
-# the # signs in the beginning of each line containing a variable)
-# and adapt the paths to your system:
-# # ====== START OF gentinc.cfg ======
-# # this points to the directory where you checked out the svn tree.
-# SVN_DIR="/mnt/data/icvpn"
-# TMP="/tmp"
-# TINC_DIR="/etc/tinc/icvpn"
-# TINC_INIT="/etc/init.d/tinc"
-# SVN="/usr/bin/svn"
-# LOCKDIR="/var/run/gentinccfg"
-# SVN_USERNAME=freifunk
-# SVN_PASSWORD=freifunk
-# # ====== END OF gentinc.cfg =========
-# * make /etc/gentinc.cfg world readable
-# * run the script from cron on a daily basis
-
-! [[ -f /etc/gentinc.cfg ]] && {
- echo "config file does not exist in /etc/gentinc.cfg"
- exit 1
-}
-. /etc/gentinc.cfg
-cleanup() {
- local exitcode
- local i
- exitcode=$1
- for ((i=0;i<${#TMPFILES[@]};i++))
- do
- rm -f ${TMPFILES[i]}
- done
- [[ ! $exitcode -eq 0 ]] &&
- echo "aborted due to error" >&2
- trap - 1 2 3 6 9 13 14 15
- rm -f "${LOCKDIR}/PID"
- rm -rf "${LOCKDIR}"
- exit ${exitcode:-1}
-}
-
-# obtain lock
-lcount=0
-while ! ( $(mkdir ${LOCKDIR} 2>/dev/null) )
-do
- echo there is already an instance of $0 running as PID: $(cat "${LOCKDIR}/PID" 2>/dev/null)
- sleep 1
- ((lcount+=1))
- if [[ $lcount -gt 4000 ]]
- then
- echo unable to obtain lock
- exit 1
- fi
-done
-trap 'cleanup 1' 1 2 3 6 9 13 14 15
-
-# lock obtained
-echo $$ > "${LOCKDIR}/PID"
-
-# make sure we do not overload svn server when running the script from cron
-if [[ $1 != "--nocron" ]]
-then
- sleep $((RANDOM%3600))
-fi
-
-# create new tinc config
-cd "$SVN_DIR"
-$SVN up --no-auth-cache --username $SVN_USERNAME --password $SVN_PASSWORD >/dev/null
-if [[ $? -gt 0 ]]
-then
- echo svn update failed - no reload necessary >&2
- cleanup 2
-fi
-footer=$(mktemp "$TMP/tinc_footer.XXXXXX")
-TMPFILES[${#TMPFILES[@]}]="$footer"
-header=$(mktemp "$TMP/tinc_footer.XXXXXX")
-TMPFILES[${#TMPFILES[@]}]="$header"
-
-for i in ${SVN_DIR}/hosts/*
-do
- echo "ConnectTo = $(basename $i)" >> "$footer"
-done
-
-grep -v "ConnectTo" "$TINC_DIR/tinc.conf" > "$header"
-cat $header $footer >"$TINC_DIR/tinc.conf"
-
-# exit
-$TINC_INIT reload >/dev/null
-
-cleanup 0
-
diff --git a/scripts/post-merge b/scripts/post-merge
index f7880de..510f455 100755
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -27,7 +27,7 @@ while read HOST; do
echo "ConnectTo = $HOST" >> $TINCCFG
done < metanodes
-if hash tinc; then
+if hash tinc; 2>/dev/null then
# prefer the command line interface that comes with tinc1.1 if it exists
tinc -n icvpn reload
else
From af3593590e3a902334115f07fe0044b52b38157c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Fri, 7 Aug 2015 16:00:52 +0200
Subject: [PATCH 82/96] fix regression in last commit
---
scripts/post-merge | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/post-merge b/scripts/post-merge
index 510f455..b2cebf1 100755
--- a/scripts/post-merge
+++ b/scripts/post-merge
@@ -27,7 +27,7 @@ while read HOST; do
echo "ConnectTo = $HOST" >> $TINCCFG
done < metanodes
-if hash tinc; 2>/dev/null then
+if hash tinc 2>/dev/null; then
# prefer the command line interface that comes with tinc1.1 if it exists
tinc -n icvpn reload
else
From a099a2af4e5656ecf7c72b577f0981f05ebbdaf2 Mon Sep 17 00:00:00 2001
From: Zaunei <Zaunei@users.noreply.github.com>
Date: Fri, 7 Aug 2015 18:22:01 +0200
Subject: [PATCH 83/96] Create westpfalz3
---
hosts/westpfalz3 | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 hosts/westpfalz3
diff --git a/hosts/westpfalz3 b/hosts/westpfalz3
new file mode 100644
index 0000000..5149689
--- /dev/null
+++ b/hosts/westpfalz3
@@ -0,0 +1,12 @@
+Address = gw03.westpfalz.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA43wJIE0+U/KMLKbgkzKSTnVYHSn1sUWG51HdA3SXojwf5ythy3vx
+oRS9xwg45tYqk34HEAGMWHjmJjKaSxOrfbushsaTKvRh4d/4v7/Y+n2rDmGmPmGZ
+O4Hp7ik6gZgM/82WSYAezJUBszHfvFS6VGF4QyAdZlT6bGKOxDL8UhCq0OetRHk4
+0vDEubUziTlGe4JZvVguMEcvQDUtKts2WOhKGzZFrq2+15q4dxLWz31H/kFHhJzn
+TCK0svoSWceNnIkoObvHEvK77uEnnN3P+7/M9j6zwEAKVtQlt2nRpWvsXP09peSX
+G/2X79hpnMVSqPl5g6Ff1YeFOHp5Q92xgQIDAQAB
+-----END RSA PUBLIC KEY-----
+Ed25519PublicKey = e5a63KazrjKCO40YdLo2IF0YZ+f6CISTdrkO8jlzaKM
From 41ac21ab620241776fc5c611442461262503453d Mon Sep 17 00:00:00 2001
From: Zaunei <Zaunei@users.noreply.github.com>
Date: Fri, 7 Aug 2015 18:22:50 +0200
Subject: [PATCH 84/96] Update westpfalz2
---
hosts/westpfalz2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/westpfalz2 b/hosts/westpfalz2
index 68605b8..4af484f 100644
--- a/hosts/westpfalz2
+++ b/hosts/westpfalz2
@@ -1,4 +1,4 @@
-Address = gw02.freifunk-westpfalz.de
+Address = gw02.westpfalz.freifunk.net
Port = 656
-----BEGIN RSA PUBLIC KEY-----
From 3454c050353b393080e3ef43be03decea61a7f64 Mon Sep 17 00:00:00 2001
From: Zaunei <Zaunei@users.noreply.github.com>
Date: Fri, 7 Aug 2015 18:23:14 +0200
Subject: [PATCH 85/96] Update westpfalz1
---
hosts/westpfalz1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/westpfalz1 b/hosts/westpfalz1
index aba1242..9a4f262 100644
--- a/hosts/westpfalz1
+++ b/hosts/westpfalz1
@@ -1,4 +1,4 @@
-Address = gw01.freifunk-westpfalz.de
+Address = gw01.westpfalz.freifunk.net
Port = 656
-----BEGIN RSA PUBLIC KEY-----
From 6325ab71c1b4ad3a7fb2b5ec1c4bae5f0e735054 Mon Sep 17 00:00:00 2001
From: ohrensessel <git@ohrensessel.net>
Date: Sun, 9 Aug 2015 02:16:38 +0200
Subject: [PATCH 86/96] add gateway for freifunk SSID on chaos communication
camp
---
hosts/camp2015 | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 hosts/camp2015
diff --git a/hosts/camp2015 b/hosts/camp2015
new file mode 100644
index 0000000..be92bf6
--- /dev/null
+++ b/hosts/camp2015
@@ -0,0 +1,11 @@
+Address = camp.icvpn.hamburg.freifunk.net
+Port = 656
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAwxJL8dxTEgfM/oSOzZivDL2NxOtplh6yCusY+cbH5u+x1aRWhfbe
+ZBv37xYGXQq1Gx+SX9zASsj50AX/XK634+NQWCHVVcBtcB8VDMA3d4WAnDtvvdwA
+L/uZQzFuWzi60Y76LZZJXmvICxatHYO+1TUUdHyxnInLjVVFotKsmNRm5T4EwOoj
+US414QvjO3Z8Hdmv8N/mA4RsMfJ7udrIbf7Rbne0w+Tfy7qgeYu1knNYcTObSHSe
+JXf0byElmtlCXP/B+/gocvCFAXg87JVrVN8OxoZgF6GvH5GYOD/nz63uQ/SXc6P7
+qsIfCa/XW2J5Jgt7DIfjQImjII55udo7DwIDAQAB
+-----END RSA PUBLIC KEY-----
From 4b26be450d7aefa0bce5df04cfff43e8cc6a903f Mon Sep 17 00:00:00 2001
From: ohrensessel <git@ohrensessel.net>
Date: Sun, 9 Aug 2015 02:30:14 +0200
Subject: [PATCH 87/96] camp: remove port entry
---
hosts/camp2015 | 1 -
1 file changed, 1 deletion(-)
diff --git a/hosts/camp2015 b/hosts/camp2015
index be92bf6..5de4135 100644
--- a/hosts/camp2015
+++ b/hosts/camp2015
@@ -1,5 +1,4 @@
Address = camp.icvpn.hamburg.freifunk.net
-Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAwxJL8dxTEgfM/oSOzZivDL2NxOtplh6yCusY+cbH5u+x1aRWhfbe
From b9fa10de5a4319c11581b8e064027a1e7d5510a3 Mon Sep 17 00:00:00 2001
From: lemoer <leo.moerlein@gmail.com>
Date: Tue, 11 Aug 2015 00:45:48 +0200
Subject: [PATCH 88/96] Added host hannover1.
---
hosts/hannover1 | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 hosts/hannover1
diff --git a/hosts/hannover1 b/hosts/hannover1
new file mode 100644
index 0000000..92a516a
--- /dev/null
+++ b/hosts/hannover1
@@ -0,0 +1,9 @@
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAxY3slVypvzpDIIBtgmOw1RQD8i+Fltb/aVjnaQa0TwwJh02wrzjz
+Kf5iREZ0sLwlaRaQRqrLZeVmwd9ZBZkh1Mk0FqThfszGtK2Dny6YmjENKO0QosUp
+HNoh8bJjUc+4Ms0kLv+ONBLNRzWRbo+9U83ckcmn0ztqg79SeT55bRhwXxtiCBQz
+wSvkO7v8h6pOgPsSfIdKodu8YOyPylR+ZKvm6MtR03UFn69Tlr1xRwCrnyl6itVX
+7koedeCMfwme0TEMMWh9+JudwT5PCXssXpy2W1mQ7XsT2SZe36mfHdnTKRn9vVUo
+qfEbZ2bPKsoLmL/46WBT5kJ6UwTsbISHlQIDAQAB
+-----END RSA PUBLIC KEY-----
From 6191078328561dffb6730e2cebe9e240739ee278 Mon Sep 17 00:00:00 2001
From: Ranlvor <ranlvor@starletp9.de>
Date: Tue, 11 Aug 2015 02:28:37 +0200
Subject: [PATCH 89/96] Added time for hannover1 to expire if no adress is
added
---
hosts/hannover1 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hosts/hannover1 b/hosts/hannover1
index 92a516a..a9255fb 100644
--- a/hosts/hannover1
+++ b/hosts/hannover1
@@ -1,4 +1,6 @@
+#Temporary allocation. Remove this file after 11.09.2015, if no address was added.
+
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAxY3slVypvzpDIIBtgmOw1RQD8i+Fltb/aVjnaQa0TwwJh02wrzjz
Kf5iREZ0sLwlaRaQRqrLZeVmwd9ZBZkh1Mk0FqThfszGtK2Dny6YmjENKO0QosUp
From cf38007f6f6f41008bb3fb67611e50c611d57d54 Mon Sep 17 00:00:00 2001
From: lemoer <leo.moerlein@gmail.com>
Date: Thu, 13 Aug 2015 15:05:31 +0200
Subject: [PATCH 90/96] Added address and ec25519 key to hannover1.
---
hosts/hannover1 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hosts/hannover1 b/hosts/hannover1
index a9255fb..60b848b 100644
--- a/hosts/hannover1
+++ b/hosts/hannover1
@@ -1,5 +1,6 @@
-#Temporary allocation. Remove this file after 11.09.2015, if no address was added.
+Address = icvpn1.fnorden.net
+Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAxY3slVypvzpDIIBtgmOw1RQD8i+Fltb/aVjnaQa0TwwJh02wrzjz
@@ -9,3 +10,5 @@ wSvkO7v8h6pOgPsSfIdKodu8YOyPylR+ZKvm6MtR03UFn69Tlr1xRwCrnyl6itVX
7koedeCMfwme0TEMMWh9+JudwT5PCXssXpy2W1mQ7XsT2SZe36mfHdnTKRn9vVUo
qfEbZ2bPKsoLmL/46WBT5kJ6UwTsbISHlQIDAQAB
-----END RSA PUBLIC KEY-----
+
+Ed25519PublicKey = qbvOwgemN42WxRBxRL8j8NBn+1Fn/RbYsiBGO2oHgGH
From a09516c6bda337573c488c13175c49b34b07584f Mon Sep 17 00:00:00 2001
From: Ranlvor <ranlvor@starletp9.de>
Date: Mon, 17 Aug 2015 21:32:05 +0200
Subject: [PATCH 91/96] Housekeeping
Removed hosts that we haven't seen a proper reaction for in the last 6 months.
Reference-Builds: 40, 60, 81, 100, 120, 129
---
hosts/augsburg1 | 6 ------
hosts/diepholz1 | 10 ----------
hosts/gadow | 10 ----------
hosts/goettingen1 | 10 ----------
hosts/halle1 | 9 ---------
hosts/halle2 | 9 ---------
hosts/jena1 | 11 -----------
hosts/jena2 | 11 -----------
hosts/leipzig1 | 6 ------
hosts/ljubljana1 | 6 ------
hosts/magdeburg1 | 11 -----------
hosts/magdeburg2 | 11 -----------
hosts/muenchen1 | 10 ----------
hosts/muenchen4 | 11 -----------
hosts/muenster1 | 10 ----------
hosts/nordwest1 | 6 ------
hosts/nordwest3 | 10 ----------
hosts/ostholstein1 | 11 -----------
hosts/rheinufer1 | 10 ----------
hosts/weimar2 | 10 ----------
20 files changed, 188 deletions(-)
delete mode 100644 hosts/augsburg1
delete mode 100644 hosts/diepholz1
delete mode 100644 hosts/gadow
delete mode 100644 hosts/goettingen1
delete mode 100644 hosts/halle1
delete mode 100644 hosts/halle2
delete mode 100644 hosts/jena1
delete mode 100644 hosts/jena2
delete mode 100644 hosts/leipzig1
delete mode 100644 hosts/ljubljana1
delete mode 100644 hosts/magdeburg1
delete mode 100644 hosts/magdeburg2
delete mode 100644 hosts/muenchen1
delete mode 100644 hosts/muenchen4
delete mode 100644 hosts/muenster1
delete mode 100644 hosts/nordwest1
delete mode 100644 hosts/nordwest3
delete mode 100644 hosts/ostholstein1
delete mode 100644 hosts/rheinufer1
delete mode 100644 hosts/weimar2
diff --git a/hosts/augsburg1 b/hosts/augsburg1
deleted file mode 100644
index 2645f91..0000000
--- a/hosts/augsburg1
+++ /dev/null
@@ -1,6 +0,0 @@
-Address = augsburg1.icvpn.augsburg.freifunk.net
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBALVQaY0axASCewZdfMPbxUBwphhoDHKzm0SvpietNy0gy+43Jb+N/Cs+
-d9l9HlAS2ngrCAahVm/GRA3iYHH2i5JdZnzxPFKdkefcZFz7x0ZDaqeqpb2YLWFs
-z2LPm37OCcsi9NPZtvDG+0Nas370xDn/6uZhCd0gAplDuI+3m0vRAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/diepholz1 b/hosts/diepholz1
deleted file mode 100644
index 10547c2..0000000
--- a/hosts/diepholz1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = gw1.freifunk-dh.de
-Port = 655
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA3SOeCXMYhCyoBXd4LhJDEdq8afDcdT2+kX+8Cnv5HHMWfKv0PodZ
-1zwPl04D3e7MJ+F73YXOIV6zAdEpwXMW6h15qg3r5vL+ZPKY/ywYnb3c1CIOe2C8
-2rJoo9ynjJJt3rbrSc2qOkKFcEfSZWPn2cs9IiaX/tgZaPwpc/KDjPQ5kQ9AwVJk
-2jMhuBHQClPUw/szHwkultrkRehQ7+H/lq7VMXdxfBHBh6Vtk6KX6N8S7NXYcKbG
-Gk52yzLnlmGLxqJbPBBg68o54EEPsS9HUe4oKRkhYoHduQu3OTL4oFZTTXqVmaxB
-JSXyXDFbJPMPNoSsC2F2D9bfPswIfH/efQIDAQAB
------END RSA PUBLIC KEY-----
\ No newline at end of file
diff --git a/hosts/gadow b/hosts/gadow
deleted file mode 100644
index c9b26a8..0000000
--- a/hosts/gadow
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = freifunk-gadow.de
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAu4C4/nHeAvAUhUQeraE4Mpjl3WV6fFUpYCp0sNXYqlp36rZZiNnG
-tpwpOiAbAAx1yutT5UvJIc9/w9WctQNvnXfpvzpSwmT/7+4QA6e0gxFjvTbP5ymk
-Kptmi43KdLppCSMFGyH9rb1yVha9vWS0INBZbzAnZK39txTMntSp9YD7ek2fZr6o
-R+Np261OAd+fEhuG0BEoGXvJscrCK8QWSTlz+xIxJV+B0d/nXGshTiXqsziwDQRc
-aG7tG6jAPsqXxU7h7/QdHi3fbncUKWRsBxX6holHEqNfks3gIUeLPelbuO7lP16j
-qRE7i2WH0bOD8oSUtAvuPE4A2PmoY++jvwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/goettingen1 b/hosts/goettingen1
deleted file mode 100644
index 733d0d8..0000000
--- a/hosts/goettingen1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = vpn1.cccgoe.de
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAqQXK6Uk1ywBmEcaTz+ncrZNRnX9Lg1QlmTqKHl6ZqW2Bro/CvmES
-YfeRWbBVeN5w5DwMZMP7PaQvd+LOgAKiubpsn3O2XssnjuLz51p+JQ8KO127i19L
-PDokpdM1AvEdHo96lDKqpSE5MVFQZeiajg6AtPtI5IR2rjsO23U9dmAEuVzCn7r9
-34+5fFyrRK+NvAbb0qVA5yUnRwEKbeYA9VAGfmm99LriL6KDyApjEqNWJt0YNOzP
-CfSoH9tDQDIH8S8CMgVkyPtqEptQGaWBjVGiO1oKB3B7SF2MjHV6Idja80zDVEeZ
-ah0MbeQWps9x/mkyWrcIPnC+2MPimQF5awIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/halle1 b/hosts/halle1
deleted file mode 100644
index fc21ee7..0000000
--- a/hosts/halle1
+++ /dev/null
@@ -1,9 +0,0 @@
-# Address = icvpn1.freifunk-halle.org
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAsYzXhlTKxR7YBUXHY0JscmtNbrFzZzviVzIhpuml499rh8TVhjMU
-ozyjbaPhSUy+9RY4F1WpRmDi3lyDx7eT0viRlOkFG8huApXEgGLQgah0M/pfwkc1
-m4xHNKwDvzJIDSR9Xq2HI3Blygr11yM7EqA+8iLAmxpT3mYqHMq4F/pzEY9p5HEN
-T7/m+PtdhO1m7vdUwh0fVz24Fa+Vwp78HmqVQxkylB8r+jM/9iiz+dajylyzeIC8
-n/wXT7Wd+bUn5K+pxWS5ReUKzDnKNkCwYcu9yO3F3xsCWg593Rog7xmILhmRzGvR
-QianIwhsORSIHAJRPq4nVFPbv4qX98zhQQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/halle2 b/hosts/halle2
deleted file mode 100644
index 469f77c..0000000
--- a/hosts/halle2
+++ /dev/null
@@ -1,9 +0,0 @@
-#Address = icvpn2.freifunk-halle.org
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA0F40mEg2vW9emNFi/Sr10rN4d/+O6VGLKjHGfMtUXxM9xILBlbDt
-Tid/mB5eOJu6CjXxLAlxrx0Ppm49jooD0BJz/Ajk7Xr2FX1pDxCAxwBBGj2iruy4
-DXs9KL54EoI+Eb7rsX0HqVLVZK32yR8B1DTTMKNyjIyR3/t33nopUPp96C1XCazP
-MpIPhnCbzqSnqRSIXo8/w4IcqaAE8/XpivRuLu3XAiIm0Ukuw3ZAJ6tS353Lj6+q
-1aXczRUu6LYpaub7owK0BF4o4TSrJcWbYuO+1gcs+5PnPNzuKXE1aT0FmG3cCU6J
-I3OylXC9/VmcN9BEBOYkAxA0sV2Wr+3szwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/jena1 b/hosts/jena1
deleted file mode 100644
index 04e96b9..0000000
--- a/hosts/jena1
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = ic1.vpn.jena.freifunk.net
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAn+x87+EeNVLsIp8qLgXQ6sQjd1EXM8yzgh1TXFY4QpNwC6v4t0e7
-UHCDiy1dP0cnZUp1ox2EXcQMZsFBa0/9qtDFns7hubjOOHeCICYUo9M//xF9+jN+
-hXAiZNAdo6LeDyjA8P9cWxuksV9GCVIWEofeWUP/1jBFVm548TEwFWAP3LKnYnz6
-HhfOyP5N4IAdMwxEYs1Qenj660w21jPnHayVz5kgzNzpzw90iH3REYUq1SPpupUr
-EjQcO3lyZFb/Jbz0TweEsco/wdSRWBHR7cl5xp6dL93sIfU12cY5YynKjlF6g+m5
-x3fAcyPoRPq29XLrrqpjUwBL/fhplvLxGQIDAQAB
------END RSA PUBLIC KEY-----
-
diff --git a/hosts/jena2 b/hosts/jena2
deleted file mode 100644
index b57a5e2..0000000
--- a/hosts/jena2
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = ic2.vpn.jena.freifunk.net
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAtn7NFxmQQkg+YIwNuvuVmy5lpodNAM9Z/k8YfPH51c9CEpK3SLM7
-EhoVqr16QTGxpr2eHqmW3vpT6qvgQoa/mdy3tpi36g4hgOEFAJ2gWvbHiALXi8YD
-hST9uKHstpf8w0WuIUMjmW34k2JHtUrX/W1Wb+FamGbgQR/UNgIktyAfFzoFNJgz
-MyxAoEsVyo77NJYLb6PAfBCy8sQ06EhdGC+TyfLe+vE/h2ymvsaxU8xqZ0PgW7Mp
-Zrss0PyB+gsR7fZFJBKpVZK2VGXK86jR5sjdi4u1Q75JW7ElaSbtU94xlmYGrX9G
-o4JzqquSAqMWfidNyv0n3EuSbGHOsP9eOwIDAQAB
------END RSA PUBLIC KEY-----
-
diff --git a/hosts/leipzig1 b/hosts/leipzig1
deleted file mode 100644
index 4f25546..0000000
--- a/hosts/leipzig1
+++ /dev/null
@@ -1,6 +0,0 @@
-# Address = vpn1.leipzig.freifunk.net
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKL7eWHmD2Rn6IP7JlSWtkphokN785g8nccBmfcjbwEwiZv+EFaVoid/
-0dPfvHaX0GaQGOhpef3PVHEbIMuU8dD9+7WbXO3+hUSIAfHoIdGK7n8qFtzTpzqn
-HAWcgneIE+sZVZRKC0B3VyQ8XujHuLCrQYkjRmVzvbb4cSzE+YhxAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/ljubljana1 b/hosts/ljubljana1
deleted file mode 100644
index c8dda7d..0000000
--- a/hosts/ljubljana1
+++ /dev/null
@@ -1,6 +0,0 @@
-# address = gw.kiberpipa.net
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAL4X76pBCF0b/z45rFPbgTrKpISle9MbLqvq3tDc2fTERowis0aBTTuK
-mfVIQkF3W+8JMcjQdez5tQWKHnfpz4PmdSC4Dmxolgk/d9b7HNQTP8MCmCLzf+D7
-nT4TLS1ZZH9nTnLbVNINNIHZTLU+8AfX3IOLCG0Shw8qDNH0QxT1AgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/magdeburg1 b/hosts/magdeburg1
deleted file mode 100644
index da27984..0000000
--- a/hosts/magdeburg1
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = 1.icvpn.md.freifunk.net
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAtZ1qWJeuTakY3AfQJ25aduwwq11dc1bBZXor4T1Fv0GuBgV6BZjJ
-TRqQendJ5HruYw5udafWZy/ZjAha2tBmj/e+wIes44lnwy/XI0TkJgLtIOznp6cW
-PZ/hlOBt9Z4nNB7lvhFmTYnTQpVwdA2gxvRfOqgEz5kuSadu23FXg562QgfHU9b6
-ob22NRf0Fuu9sfHIdcrUoxwZDfQaFjnpmHfRmdcjJp2Fy0MnptzYXCg7aD9TsF5j
-qdEtjSu0MvvnpxzcYZRWpi0ErdZvXBqh0f7DtHwvX2bS6FaGFe/Nj+I7JDlqQ5jh
-3FOkdmyta9Pk38GfdI183g2LmRYDl/8paQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/magdeburg2 b/hosts/magdeburg2
deleted file mode 100644
index 6f2b7e9..0000000
--- a/hosts/magdeburg2
+++ /dev/null
@@ -1,11 +0,0 @@
-# Address = 2.icvpn.md.freifunk.net
-# Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA6v9HoQhGnAaWsSofuT4gplTOBhzmDz23wdQeWkVKM2tY7WCA1KNO
-7cUmVefNOejtm5H4qhLqMze5gkj9DaSXVaWvzxCnz80wH6MzdYaQU/v0gq+VL2DZ
-7M5EZeGNYdwvdBXq3T/suMdMC81E3FJnvLazdk9XBQdQivfjfqlFLWTMivEdjDN8
-9MSK1vp3W5KqfQbx1SAVz7Bsca+Jpn75KJVt7AXL6VzVbHi6neVuKlxj4mT5iVc+
-00ESOxZ4f/0XAjpLfaDYv9eu6w7mwQtxfksjDAce4R5AcC8BJF98RZne27twM5jz
-Ykorh/NOpnajo99q1Lb9h7c2vcqj4t0RSwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/muenchen1 b/hosts/muenchen1
deleted file mode 100644
index 73b1c6e..0000000
--- a/hosts/muenchen1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = gw01.freifunk-muenchen.de
-Port = 656
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA20ydh6auuT+FCBp5RiOP0PxaH356/zx3YxO18q8bJFnVXIyrVhLO
-QnhDGpEqYcccNMdmVPHQiroWsfOrNwBf69OyZobndbHVfFCC/HNtVl3EHPRClIeS
-oIyGWvXpnXCrpCUfghNPhAt/JoUM5fkKkNA+/vyJzU+RTBu6A1h3HnGshDMDnt5T
-Fe2J/8S00p0M8NjZiRyRMwhq8cx2XpK4rRN41Rr77Mafe6dhM9w73hCHp/GX1W8S
-2wByI+yoUMz8ld35iYoKEVQkWapGrvG/4ZvSJkZw7dtwJuRxyoXdjCROKWsTPDnR
-TIuD7yd4DSboEk9kCED4O4BPtMYFDIlkUwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/muenchen4 b/hosts/muenchen4
deleted file mode 100644
index 5f2294a..0000000
--- a/hosts/muenchen4
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = ffm.netz.org
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAn7jl+pcXgObhzpo77iAYNaXQ7xDPFkI3J1XBVP/4mlMWaNMRP/MX
-rQn5AmECqrjp+iXgJHiZqO3V+SraYv402Ry1Q9nugKuF8oaY3kogsT2HNWlp5TsA
-LtkQb4VLl6hMAYQ++y3lCG1URipQ5F+K2N5ofBJHAcqnSukgz2Fsn6gNs9nZHci2
-u7HYi0kpCLpqej9DyijNC1aCVF2HrkPq6P87CXnfZiWjbjGbiB2xj1GHmI5VdyvA
-GBlt+Xpm09V0sy1YBwGEeqSRvhIiZbJFz2wr2kIVkv7ZRyn4OqnzXkml6Bnhc948
-+2whuRYgWXVWyK4tpFdIg9Oa1GeHt5QWvQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/muenster1 b/hosts/muenster1
deleted file mode 100644
index f827c19..0000000
--- a/hosts/muenster1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = 78.46.190.61
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA04VN8hn5Bm4jEFLEexRP6XOq28OWnH/9k6n/0NMgFXPDRPabU+LF
-70mgOYJ4iLcux8MPJg2snWbpN9XAGBPIlH4B0D+sIGdIZstsFd9Qi7zeAIPie4n9
-e/qTQFC7xOfDbQL+Rhz7Xd5T3tTXn3O0WjiMb5fQC+hqOJC+7aQY0S+8Eav/6l/v
-EdmxSFoJOFs2NHz1GhqVy1S0LeZ5P6VE4s/Lg6oTi4aY1pKpAEzYGdPdVlIfdW2g
-OeBYayzhLwiEUuM1YAEJPbRgoaT8SFDAzD0smwcb3c3O985wdDWklCeYOoM2iNqd
-tGGuWEuSOCp89ltLRswD6zQZteAA9vMBvQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/nordwest1 b/hosts/nordwest1
deleted file mode 100644
index 00525fd..0000000
--- a/hosts/nordwest1
+++ /dev/null
@@ -1,6 +0,0 @@
-address = vpn01.nordwest.freifunk.net
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAL0EZpLOsOimfcTybJByDdI39NjG7Hmu456sYpJTbNt1wFW8BqrtcWCx
-+lv6+kS0Vx1z3KBjPh5H4wSCP00SmNcFKMde5+2LAe6mQcAs/daRhccyw9T1f6uy
-o6j5+gscVjM91wwEO1K+KZNHnZhzRtiwo3muclspQJplNLbhhEphAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/hosts/nordwest3 b/hosts/nordwest3
deleted file mode 100644
index cbd2ee9..0000000
--- a/hosts/nordwest3
+++ /dev/null
@@ -1,10 +0,0 @@
-address = vpn03.nordwest.freifunk.net
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA1Xki3dIEeI/6rj9PoG/m6/M35Rtv510Xum5KtPrqHOcwaoFKXufR
-BCd5hFYLuWZy9DHUkk67BIgjnPktdJCGvQKwVvFlh7/UNLw+ylyKRt7OoF3RpnOK
-QilT90JeoMLLEmk9AXv6K+Q9hF0NGE/bGoJOJ5K4qTW2jffgHxcjFvOspd13zIxS
-OPP/12CMrcpW3g4tYEgGhetSMiwKdtWktctxU1ILwjRH15/hQOM4zSVNnWXxTGJh
-3+7QgCOpmbEb2VEqOuyNMoJnzFrSxwEiVjnVSvrvzXIBa8vapoUn2MJuazy5bsxk
-NYWWhLtm3fTiRxcqWbIewimZvobYqYGrnQIDAQAB
------END RSA PUBLIC KEY-----
-
diff --git a/hosts/ostholstein1 b/hosts/ostholstein1
deleted file mode 100644
index 5d9a891..0000000
--- a/hosts/ostholstein1
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = gw1.ostholstein.freifunk.net
-Port = 656
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAoWCQbASGuIfvD/i2jzm2uudqYcZ8Fc/l75RIYSdk/rujVTlN98J/
-p+abYXHqkfmCejjOEjnFsLgUFtl58CagazUDAYHGZjsia0hb9pxG0gd8z1Evyuus
-Hbrw1ZgJxsFWfsFB+QhdhlEiECBB43aI+ZFTu97rqMyK+43On07jAw5wTe5Y1lJ1
-DZYIubdcr4JLXKh+oQTT6BJwgkxZhciHbtJoddEUmLsqdIMNapWWswPljQ8KywUx
-y8TwIAGmvJT1M/vAQg6g4rHlTICZOvahNz95avZwwpOUCOjO9FY8flZpy7g85aXp
-wZSN0aaYd1GYbaQxYWzyTYZZT+WxGSWuZQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/rheinufer1 b/hosts/rheinufer1
deleted file mode 100644
index 223b531..0000000
--- a/hosts/rheinufer1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = rheinufer1.freifunk-rheinland.net
-Port = 656
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA5MIt2T0V8Non2Tpv9MmA8I6ekEaKl/sKZIz2LMzYe7n1wOh6ncHu
-INd5PklfgEFEPwRYxvrVs/kFWwFZJJqSr5i8eDfUMH0qFkJIrync9y9EhhTdiwdw
-+dQZooNYByIxxEAZDiev1ptunCdC1uIe5VIqHBDFI6tieYKtSd+5eTBIk0kehBqy
-Pn9+8gTFqqrqkhPMBgZugtX09MItL98fTTque4snF8GGsAI9AcQ+Cx2hSd1HCVM/
-22RVSz8nO2aIxl+AqiBpWAI2JnB6uzq/OyvV6GwMAetXNyzenE4OCnZmqymSGrnR
-wVFVCrIUGqLFLxerHnzosrzQ+JI5YjzTWwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/hosts/weimar2 b/hosts/weimar2
deleted file mode 100644
index c50d001..0000000
--- a/hosts/weimar2
+++ /dev/null
@@ -1,10 +0,0 @@
-address = vpn2.weimarnetz.de
-port = 657
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA3fPb1CWkdbKcL1Cl+klgKYV7hLJppEg2pU0Sm2/jTp0yIFmhfSYx
-GGTIbJnlZD04AKVxeJY11F5KwWpOaef88zRtZAqLs6VtsWXpKrPe5hM2Wc4phAJC
-5xOgvzvyPtFlf7oLt8Es+owbiNuf+ZavtIKLjhkDK5BwBiYGTgV+d184WJKSxbUx
-2RpP7vUpK58xVhMi/nAZBxnG2OkDAxReaq0iB208SlsiLUfxSvTUpI/BqP0HIezK
-pO49Kdq191PH+TWhdDh9IsEFUIEyX5rS5S+fR3P07k5XImPke3771qt1oHnSPSvq
-2bsBp9PWLecIBtnZxwsbRvd65vRL+Pg71QIDAQAB
------END RSA PUBLIC KEY-----
From 81c40c04b5baf2a08750eaea65abe2344d0aa2ae Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Mon, 17 Aug 2015 21:46:42 +0200
Subject: [PATCH 92/96] monitoringmoehne: add address
---
hosts/monitoringmoehne | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hosts/monitoringmoehne b/hosts/monitoringmoehne
index 9bf2b87..464f899 100644
--- a/hosts/monitoringmoehne
+++ b/hosts/monitoringmoehne
@@ -1,3 +1,6 @@
+# as determined from `tinc -n icvpn info monitoringmoehne` ;)
+Address = 188.165.145.158
+Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEApOhvm7ohievOIunqK7L2zb1Y40msF65qvwRzLr58x9byIp3pw7Ay
From c70246532328c768c30f3eb44c74622d5e37b3ac Mon Sep 17 00:00:00 2001
From: Martin Weinelt <mweinelt@gmail.com>
Date: Mon, 17 Aug 2015 21:55:32 +0200
Subject: [PATCH 93/96] augsburg2: remove ecdsa public key, we don't use those
---
hosts/augsburg2 | 1 -
1 file changed, 1 deletion(-)
diff --git a/hosts/augsburg2 b/hosts/augsburg2
index 4e71c79..12e1550 100644
--- a/hosts/augsburg2
+++ b/hosts/augsburg2
@@ -9,4 +9,3 @@ FaDXnHb7Wt7rYWSlT46q+/Zt7AZiHgBd/usMMYC5LFvR0Qgc8ucIFYRUx45xhpas
ybwKAkWQ1bw81+z3hElADcXl7SwH9PHlk07hU6Q1fXgff5OIPxC7SzzSKFjyhOIA
dvKC4YdGD6FA2kP6N3FIe2Oio2LPPBSDLwIDAQAB
-----END RSA PUBLIC KEY-----
-ECDSAPublicKey = DAAIed61lV/AudLIIE5Fb2VVp7sYR71IEcfPgEADGUL0z2JHci/ymtmp2wp4kAzu+JP8SGR1F/ayhPLQHD/tbG9e1D
From 46a733b2f7ad0acbd033687c1e5793cdf1779081 Mon Sep 17 00:00:00 2001
From: Kai 'wusel' Siering <wusel+src@uu.org>
Date: Mon, 17 Aug 2015 23:41:37 +0200
Subject: [PATCH 94/96] New servers, new keys
---
hosts/gueterslohbgp3 | 10 ++++++++++
hosts/gueterslohbgp4 | 10 ++++++++++
2 files changed, 20 insertions(+)
create mode 100644 hosts/gueterslohbgp3
create mode 100644 hosts/gueterslohbgp4
diff --git a/hosts/gueterslohbgp3 b/hosts/gueterslohbgp3
new file mode 100644
index 0000000..e14489e
--- /dev/null
+++ b/hosts/gueterslohbgp3
@@ -0,0 +1,10 @@
+Address = bgp3.4830.org
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA4cZSwPeKpX00lJOkKbEXQKdFsnOKwMWaU8T2oadaPdmWLz8xKIXz
+Pb6CEDfxFfGW87OropAfPT/gZljFU88EShNN48N1/SOQ0KbOUwFJUD4UEuL4VuZE
+9aJA1JAthpxhMXS7taAmnINZ2CgROPEcER9xMVrmx25Z9T8pOnDmKjvEeWb1w3DV
+6qN0z5FbqF9ykrgMV8vhnK8HEz1q9iuzagjXy7O04uhGkBSSOBk7/Ie8luOWHjnJ
+4URFRLUgYO3ZCjq9oEsEVCQtcmzr1U+a8GBY9zEVKB15bG6dH4KuJIpJBWOqe1XE
+Xc610yCa4U9f8SIu+gqNmTpowie5OemnlwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/hosts/gueterslohbgp4 b/hosts/gueterslohbgp4
new file mode 100644
index 0000000..67762e0
--- /dev/null
+++ b/hosts/gueterslohbgp4
@@ -0,0 +1,10 @@
+Address = bgp4.4830.org
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAn2hbVCw7yAGGMCVQcWMBzhWpp9JdW/zGRuE16B5YAfNQVWs+uQzz
+cntoOGCXmn3JsdEjsryIE+26Zb7xwnO/od5GTP5WxZViH3ObjDHxlaP+KKP3oQyl
+C8sQjjrWInLYNkubp1xaWui84WMsRrdKMNjCKsfxRud9NP2Tksb9passbjMB9DaH
+JrMcl3kfQFZjkRqVRvzLomYFcZBFYOii5IodeHt9wy5cymWUCvvOs8+pu2vd274l
+mtFR1TBx3KwC1zR6g8Ggy0hnq7nTV8pX/9qjBcqHnIlbTiPdgqxyH42m9/pLnkBp
+LghlFJWoRe1MMH15QC2SteJJ7quwk73XewIDAQAB
+-----END RSA PUBLIC KEY-----
From b7a381084d70e266bd0f1f2ca567b2a2c4e2fc9c Mon Sep 17 00:00:00 2001
From: Kai 'wusel' Siering <wusel+src@uu.org>
Date: Mon, 17 Aug 2015 23:54:53 +0200
Subject: [PATCH 95/96] Wiped guetersloh1
---
hosts/guetersloh1 | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 hosts/guetersloh1
diff --git a/hosts/guetersloh1 b/hosts/guetersloh1
deleted file mode 100644
index 258c52c..0000000
--- a/hosts/guetersloh1
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = gw01.guetersloh.freifunk.net
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA1V07P1Lv4dafLwYUlZcsj+tNMrNU+jV2N/+h9RA7wnst77TyFMqZ
-/AmPnFUNQ6TyC/GuK8YqQV+Sx+2MWzVska0F2uY4T+YJ4aDAZhua3YwJCHEUODuC
-6yWmvujCOmZ5WTusPd6Nw+jUtZPXfmtWSBXdlyf1q8uu6ZTGUf/BdeXHUSXm3607
-vcaY5gkSVDeEOiYm1BR4iqvljTpKyXr4kHRGk4Bs/arW2g4HQH05VFCP8V2di3Ev
-qzWkX71gwHAf8fgrPchYAsihrBbbKxPYpVDBehbdofyETHRaJAVnBFIBgKWSJfFF
-Vx3j5miT5PvRRdLXKZkNztgFLaj+yLQrsQIDAQAB
------END RSA PUBLIC KEY-----
From a458ad4f5c0502a2eaf823cd1ae6c1e48fa37233 Mon Sep 17 00:00:00 2001
From: ohrensessel <git@leokrueger.de>
Date: Tue, 18 Aug 2015 12:19:59 +0200
Subject: [PATCH 96/96] camp2015: remove
---
hosts/camp2015 | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 hosts/camp2015
diff --git a/hosts/camp2015 b/hosts/camp2015
deleted file mode 100644
index 5de4135..0000000
--- a/hosts/camp2015
+++ /dev/null
@@ -1,10 +0,0 @@
-Address = camp.icvpn.hamburg.freifunk.net
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAwxJL8dxTEgfM/oSOzZivDL2NxOtplh6yCusY+cbH5u+x1aRWhfbe
-ZBv37xYGXQq1Gx+SX9zASsj50AX/XK634+NQWCHVVcBtcB8VDMA3d4WAnDtvvdwA
-L/uZQzFuWzi60Y76LZZJXmvICxatHYO+1TUUdHyxnInLjVVFotKsmNRm5T4EwOoj
-US414QvjO3Z8Hdmv8N/mA4RsMfJ7udrIbf7Rbne0w+Tfy7qgeYu1knNYcTObSHSe
-JXf0byElmtlCXP/B+/gocvCFAXg87JVrVN8OxoZgF6GvH5GYOD/nz63uQ/SXc6P7
-qsIfCa/XW2J5Jgt7DIfjQImjII55udo7DwIDAQAB
------END RSA PUBLIC KEY-----