freifunk/icvpn
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

merge into: freifunk:removeold
Branches Tags
freifunk:master
freifunk:removecamp
freifunk:addcamp
freifunk:hh_master
freifunk:update_hh
freifunk:addhamburg01
freifunk:remove31c3
freifunk:removeold
freifunk:add-31c3
freifunk:add-hh02
...
pull from: freifunk:master
Branches Tags
freifunk:removecamp
freifunk:addcamp
freifunk:hh_master
freifunk:update_hh
freifunk:addhamburg01
freifunk:remove31c3
freifunk:master
freifunk:removeold
freifunk:add-31c3
freifunk:add-hh02

12 commits
removeold ... master

Author SHA1 Message Date
Nils Schneider b5a3ba1aa1 Merge pull request #64 from FreifunkUFO/master 
add freifunk gadow
 2014-12-28 22:28:49 +01:00
FreifunkUFO 856e729581 freifunk gadow 2014-12-28 22:02:06 +01:00
Nils Schneider 9361512471 Merge pull request #62 from nomaster/master 
added ip address and port for Rheinufer
 2014-12-28 21:23:28 +01:00
Mic 23a42b87b8 added ip address and port for Rheinufer 2014-12-28 21:22:36 +01:00
Nils Schneider cc19863875 Merge pull request #61 from nomaster/master 
removed Rheinland, added Rheinufer1
 2014-12-28 21:18:19 +01:00
Mic a0ceb94cfe removed Rheinland, added Rheinufer1 2014-12-28 21:17:19 +01:00
Nils Schneider 23996cdb26 Merge pull request #60 from elberfeld/master 
Erster IC-VPN Host frü Freifunk-Muenster
 2014-12-28 21:05:28 +01:00
Nils Schneider 790dce34d6 Merge pull request #58 from freifunkhamburg/removeold 
hamburg: remove 05 and 01
 2014-12-28 21:03:03 +01:00
Nils Schneider 7da68437d8 Merge pull request #59 from freifunk-goettingen/master 
Add pub key goettingen1
 2014-12-28 21:02:51 +01:00
Christian Elberfeld a5adeb6900 host muenster1 eingetragen 2014-12-28 21:02:49 +01:00
root 9e81a9d07e Add pub key goettingen1 2014-12-28 20:57:17 +01:00
Nils Schneider 881761be5b scripts/post-merge: fix documentation 2014-12-28 20:45:52 +01:00
8 changed files with 41 additions and 26 deletions
Show stats Expand all files Collapse all files

10
hosts/gadow Normal file
View file

@ -0,0 +1,10 @@
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-----

10
hosts/goettingen1 Normal file
View file

@ -0,0 +1,10 @@
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-----

10
hosts/muenster1 Normal file
View file

@ -0,0 +1,10 @@
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-----

8
hosts/rheinland0
View file

@ -1,8 +0,0 @@
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA0TDDa3uBpJq8myoeDKV4yky6fZOdU6H4UT4Ex/pdMvkv8zxfgNuk
vAcjrKfas9y+TFahj3E/dyKJto0M26Sv8cUYI3E5plXkZ/MJFSIA4WIe0Xs5uaaI
1D68B3QuYvvxHE9oWMLnfpxD925t69gGRrMxAZ4Uj0U89pewwh9Qxgd53bj4YTTO
aU8qWswIsK4WKEUT2Kz/yYt743eYKJnQBoJgPpO+cdOyIWfdP4BjWJe+OZimsK0D
qel96RXJsjty0F30Fz5IgbIFbsJ/S6DUiGtcanIhkGbCSq/ldcuU4XodBXmPbYpA
5l9I2/KcOJmBJLSDpTjf11UYVYnFrBozJwIDAQAB
-----END RSA PUBLIC KEY-----

8
hosts/rheinland1
View file

@ -1,8 +0,0 @@
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAwK1wirB20JHRPeBrXzJkgfT48Bssr7EPTJ3A6qLl2lDB9xJP9aG4
0VlYy4LDEgl5QAILcLVvx2TiyDLCRhF5Fqeeisf3bIDRuvFJFZEbyEkpVQh/R08y
A1K20JNrOrsc2Lz3IMwORXrVylYwZNK4xySvByF3gA1Z64mViQMlXc/symn8eC8Z
Z0rCJPWMSKBWkGa3h3I8fcCv9Mdb+otQD/0BaGtNIrSqZ8/PeovuMmN95gUaXqUa
DqSgrwy02o1TwdVWxWb89XxvjNLRIHwM2T4pa6rncYeXMwx2mtVleE0BC/UM/kes
cpp6eeIwxTaHVji7maKLvBj1PaNmfS56lwIDAQAB
-----END RSA PUBLIC KEY-----

9
hosts/rheinland2
View file

@ -1,9 +0,0 @@
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAuEw4ZlMsaSJVlNvgAdX42Sfrg9D+Kqm0UMNl1q0a6gTi2HpTvTbK
eIYQcIcZG2JteGY/lg3oc+MrreHz17SXw4nxT7YABNH8qvPrUYxpKWFv/DoviFvW
sNA3glksMHoJlWsO8x+90zDWTGJa03vfWtOLXr+srg8otlbcXqCWFHe9FCMxpZso
ffc2mejRLXw3irFx5udovVd3HJQn/pS37P/l1inCxTnjZWi5ywuMv61a3gKKaETk
jOfznx36Dmpdi5RABl3Yy56Vgcv1xGYvZVEwC8VG6mMRBIg8TwhCUW3etHJz6W3L
NHBDvfM4ZwNpItA+TdPUZiYHD5lE4w66lQIDAQAB
-----END RSA PUBLIC KEY-----

10
hosts/rheinufer1 Normal file
View file

@ -0,0 +1,10 @@
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-----

2
scripts/post-merge
View file

@ -3,7 +3,7 @@
# post-merge hook for Debian systems # post-merge hook for Debian systems
# #
# 1. copy to .git/hooks # 1. copy to .git/hooks
# 2. to test run "git pull -q" # 2. to test run ".git/hooks/post-merge"
# 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/" # 3. create cronjob running "git pull -q -C /etc/tinc/icvpn/"
# #