freifunk/icvpn
Watch
0
0
Fork
You've already forked icvpn
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1 from freifunk/master

Browse source 
Update my repo
This commit is contained in:
Kai 'wusel' Siering 2015-07-17 18:02:26 +02:00
commit da4c03843a
103 changed files with 1006 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml Normal file
View file

@ -0,0 +1,10 @@
language: python
python: "3.4"
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/"

1
.travis_requirements.txt Normal file
View file

@ -0,0 +1 @@
python-nmap

75
README.md
View file

@ -1,4 +1,75 @@
This repository holds IC-VPN keys and configuration.
[![Build Status](https://travis-ci.org/freifunk/icvpn.svg?branch=master)](https://travis-ci.org/freifunk/icvpn)
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, 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/
### 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.
# crontab -e
and insert for example
@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

6
hosts/Treuenbrietzen
View file

@ -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-----

10
hosts/aachen1 Normal file
View file

@ -0,0 +1,10 @@
Address = icvpn.nodes.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-----

9
hosts/amsterdam1 Normal file
View file

@ -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-----

1
hosts/augsburg1
View file

@ -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

2
hosts/augsburg2
View file

@ -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-----

6
hosts/aurich1
View file

@ -1,6 +0,0 @@
Address = vpn.freifunk-aurich.de
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAMTmDsazE1oEcjoMdiVtRtRyY1YX13DtK7O3sYdNMUjQA1Zn+OgDPRxm
okwOAvT6ZqWr9xLmYWose3Vh7x4wuuNRuGaKgbB0bqWGWBlYeaqTTKGT9V/eJalj
n3of5UZQkTDpYHd4RWNRbYKT69sLfR4/8gmp4EUbAPD4JRBrUGPvAgMBAAE=
-----END RSA PUBLIC KEY-----

7
hosts/badzwischenhahn1
View file

@ -1,7 +0,0 @@
Address = ffbz.ath.cx
Port = 655
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAMlCF8Yj3adfH6Mssc7J59CMIzO4ZTa4meHXDaGWHXzGIMnUWRUlLIfp
7sa/uJ4U9iQU3ZEwv1cPWweDvWrG1HNL+oJEVv7xQWcBXaYnm0le305qom0E0U5U
cMt+yNZWTh2KfgJjGB78FuOas1yiGpVPnV2wAGgzREKgmiXTOzZnAgMBAAE=
-----END RSA PUBLIC KEY-----

2
hosts/bayreuth1
View file

@ -1,4 +1,4 @@
Address = freifunk-bt.criede.de
# Address = freifunk-bt.criede.de
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAppgeP431r3K4cgy9s1XUB/+SEb9F64Y9q34jxjwRssIaFx+mtukr
JDLFtRNNTi7ao+kL3s1OBhavCeKwYSFAlaQnIm7fLwKwhJiIZwnKVM26SJPUwPfP

10
hosts/berlin2 Normal file
View file

@ -0,0 +1,10 @@
address = icvpn02.berlin.freifunk.net
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA1+W5ZQo4iDlSZP+XEaEl89g4K8md9ob9i6SDg6YRGCZQG2dUjtZn
YOxi5fHhk0WUcHtUwTBPj6qQ7AlsLF3MOBbK7wI+rUQyMXd+CfEYC2xAhXFIjgfx
Takrqe55OppLyKcviAvlETYBdmOa67OCJTH8k3HfZ8RGAubPcxUyyyfvrNT6UTjC
CfSdli8aLHlQ/PrjBeV+Z8o4GpnI6FKDfOMVdvqFGta1tP4YVUmb+EGVlDeLRHZ9
oWXFlwfbaYIvrgu/I6TuDaOABO11ZdjqObPnAOtHY+PMzdfXe2Bwp+6qzeUYKs2q
EIR/2m2ioMC/IXF2lBQH37JqN9V1s6PmiwIDAQAB
-----END RSA PUBLIC KEY-----

10
hosts/bielefeld2
View file

@ -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-----

12
hosts/bielefeld6 Normal file
View file

@ -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-----

10
hosts/braunschweig1 Normal file
View file

@ -0,0 +1,10 @@
Address = gw3.freifunk-bs.de
Port = 655
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA1SlHQTdW8wnYWpSRwZWx5BHOHm+0WzZNN96edmUqAi5hrVQwVCeI
ycmGtk4iOqyMPPynhVf/aM3huXNXI9ObCKau+QUsmEv7c30RId9J5WxvQ7qCejf/
v/kGJF9B1LPtZ5v0bB1euxypty5g5SBdfQ2KhLHyRUiLqOTBenhoJmI/KNjGxC1P
A3IzGF2/3gtxbq6eRpdKRl8ZoEXuaLKzkBEM8mwh9QM9ybOXOd1nM3K4NCyB2Uej
Vuikr2sagN+GVZhZOV2HfCb7xVJUdEQCKRIDxzmUu4/NtZEmkGFqfce1EeFkvJmu
/XeUr8QRaIIPwirMNy47UCtD4Q2NQBjHVwIDAQAB
-----END RSA PUBLIC KEY-----

10
hosts/braunschweig2 Normal file
View file

@ -0,0 +1,10 @@
Address = gw2.freifunk-bs.de
Port = 655
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA3vOFU3pGxVUVHAEDeD4suiW8tUuwekWle8Tu9nx13BEepdZFof7m
sgqhJvbfqRE6JZDYCCzZPRT03xBNv88odzOqhgHSSg4qEB5/hGtdJGHBRZdGJd0x
XGYv/eHAH6nh2Dx7jJmYinRDC2IVrZkVtKEmQLSLgYAKhNw8BKRHqaxAjnYl2Ar+
RITsxp1qcRxt2yt5AShN5APPzp2SSzV7HB4Xjq/D55WduwejPCen4SZnjrhgLdQM
kSJV31Mc3zlhmN5KSgkoCGbkky61XXehl4fXCEJ4maA0mmLU0AMHq1jRek0gI5n8
VBefp/+MVxJ2cSE9EGuqRqB9b3DJOs3hTQIDAQAB
-----END RSA PUBLIC KEY-----

11
hosts/bremen1 Normal file
View file

@ -0,0 +1,11 @@
Address = vpn01.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-----

12
hosts/bremen2
View file

@ -2,10 +2,10 @@ Address = vpn02.bremen.freifunk.net
Port = 656
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA3hpaoTvL0tI0Rnw9jpYGv+EfPjYzWuYf3xWy5DHBRN+8ualTk6tx
xzM+3Kjwlb9QtEkSVbGh6RRX7n0S6zwWc6TXYW9hnOTxzWdb+a7yAb80iXNl/8yC
MOOPphTKl15go7juW46/k4mEPxI/VStPmheAeMbU4YZDsspLta1QWr1Oo2pCON2B
pDCBE/PlZOnJ6L3JX4Wxt9LQsUsB8nWNmVFK0LC6NoN+fASz/qrnTwi7kb0PWIrS
8vEoS4J8NKjB5yT8GZyhZma5B48u7ABVNQoSA+9f27PZIq9a7h/mHuQUpaNGvbgP
I8pYwBqEmH5HUJGApprS9hpevdm3AUE0KQIDAQAB
MIIBCgKCAQEA5Wtnae3Qx2Dxf4PPPQuC+E0nOanMw4sbOlXjNBTNrNKAMVCH2MdZ
+cWZXIqyJ0aVYdjbH26tL/gjY/Uts9o52F6NpVCGrrgiua+qgLS0ZrlUllIjdqOW
yStc+1OnouhTE24KR81SMOsfmtyIt0IboCfB7TcJGbtjpQopzSks6Yv5fY/ybmm4
3i9DSqYgJstBqMCZ2KNAajjMzCaQqljMR5BAYZsILo62MUa//oTZ4+M6XcODvctP
vPWfi5DWq9eFx2RiG03ePk2PWDFMazx3QXo5m/2d9iYVAqwJuwecayheGBmmAw3s
mBbTnmJ24P5o3JrkyefsQCmLpyajfab6zwIDAQAB
-----END RSA PUBLIC KEY-----

11
hosts/bremen3 Normal file
View file

@ -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-----

10
hosts/castrop1
View file

@ -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-----

Some files were not shown because too many files have changed in this diff Show more