summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--retiolum/hosts/Shepherd2
-rw-r--r--retiolum/hosts/ThinkArmageddon2
-rw-r--r--retiolum/hosts/albi710
-rw-r--r--retiolum/hosts/also3
-rw-r--r--retiolum/hosts/bergwerk3
-rw-r--r--retiolum/hosts/box10
-rw-r--r--retiolum/hosts/destroy3
-rw-r--r--retiolum/hosts/eigenserv3
-rw-r--r--retiolum/hosts/euer2
-rw-r--r--retiolum/hosts/fuerkrebs2
-rw-r--r--retiolum/hosts/iiso3
-rw-r--r--retiolum/hosts/miefda11
-rw-r--r--retiolum/hosts/miefda90110
-rw-r--r--retiolum/hosts/miefdahome9
-rw-r--r--retiolum/hosts/minikrebs10
-rw-r--r--retiolum/hosts/pico3
-rw-r--r--retiolum/hosts/pornocauster2
-rw-r--r--retiolum/hosts/taschenkrebs2
-rwxr-xr-xretiolum/openwrt/tinc-up19
-rwxr-xr-xretiolum/openwrt/updater6
-rw-r--r--retiolum/scripts/tinc_setup/write_channel.py8
-rw-r--r--streams/stream.db24
22 files changed, 110 insertions, 37 deletions
diff --git a/retiolum/hosts/Shepherd b/retiolum/hosts/Shepherd
index 1477b3f6..4b6c5f42 100644
--- a/retiolum/hosts/Shepherd
+++ b/retiolum/hosts/Shepherd
@@ -1,4 +1,4 @@
-Subnet = 10.243.0.145
+Subnet = 10.243.0.145/32
Subnet = 42:0f19:8a1e:7865:721b:2378:beef:1158/128
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsW0Pbgvl+hATKqQR6H4yPg1kphMsxrXvh/CMQY8dXVVD2mDWBHaL
diff --git a/retiolum/hosts/ThinkArmageddon b/retiolum/hosts/ThinkArmageddon
index cec62e11..e51e1c92 100644
--- a/retiolum/hosts/ThinkArmageddon
+++ b/retiolum/hosts/ThinkArmageddon
@@ -1,4 +1,4 @@
-Subnet = 10.243.0.137
+Subnet = 10.243.0.137/32
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA1EAiyBWICkyB1zHE31fHSbGR1nJJmXSfnrqm9yXRZSGweIKrbsof
QVcRzM4vsFBRUMBeKW7fzlGcvgXULFRnGelvEl4GRiBMO9odBlBI3t8CjZW7X2N7
diff --git a/retiolum/hosts/albi7 b/retiolum/hosts/albi7
new file mode 100644
index 00000000..0a21107e
--- /dev/null
+++ b/retiolum/hosts/albi7
@@ -0,0 +1,10 @@
+Subnet = 10.243.0.7/32
+Subnet = 42:6c61:6962:6137:626c:3769:000a/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA+SwdWv1anjIaKSnvel9d23tgqye5RguIVfgMnjpMsqOYpFklLIa8
+4wREhVvpiArnIsoTXbKzdeCFgaAbMS6aQ701Pyv7QriVy8m3iUlgqvB/znogxN8U
+z1fqL0jAHLkQkoyZ2a6mUgHpByvUqZNcq6istYLwGnXO3JQrS7U54hHPpXbxwFY5
+0/Wli9OueG4fWaZ9skDa2Faq4c/Lngku+Iv1gBBgII1EDSsgedNWw3YBTmHDFNTZ
+SsORj2ho5nQgdvw42qEINbxpU01jK8XB+jmVEO+ixZZCsWlOeCjl9Zym4MZDRePg
+euTLTbgs/809ElM8V+EzRKSPNR2k6FrBXwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/also b/retiolum/hosts/also
index 42d54ae2..59a251a7 100644
--- a/retiolum/hosts/also
+++ b/retiolum/hosts/also
@@ -1,6 +1,7 @@
Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128
Subnet = 23.42.0.1/16
-Subnet = 42.84.79.215/32
+Subnet = 10.243.0.50/32
+Compression = 9
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry
Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ
diff --git a/retiolum/hosts/bergwerk b/retiolum/hosts/bergwerk
index 43f6c1ba..89aa7ca5 100644
--- a/retiolum/hosts/bergwerk
+++ b/retiolum/hosts/bergwerk
@@ -1,5 +1,6 @@
Subnet = 42:a7ff:3577:0526:3986:650f:c175:30a5/128
-Subnet = 42.246.229.109/32
+Subnet = 10.243.0.51/32
+Compression = 9
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAuCX8FVI6xQepPf0goaErA35grHcBNbYvzKIXzEIOEuxiVLX4FXoY
aHdUaz9Z2/rECuDQCVzke3TLZgBn9ai7ruT5U077h0q69pS/vI/Hr2e3s50tQVcu
diff --git a/retiolum/hosts/box b/retiolum/hosts/box
new file mode 100644
index 00000000..e02f8ca6
--- /dev/null
+++ b/retiolum/hosts/box
@@ -0,0 +1,10 @@
+Subnet = 10.243.43.43
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvUMfRZOPb/zKvALZTyxKQuzowqqJ/HW2lm/RIOKL2uoTUgVX1DJB
+fCLf66e2fHnjnStXuaMDNs1kq2gi4EyK5Q50RxVBq7XayXYqfnFwzTE+Iqape542
+vYSWKLdrxljln8a2EYU7njtcWkTpW+cJIwSHEUkDLAowF87ElQ0gBmyX4p107pow
+jg7zcYierVdQXkI7mO4g2zWsywfhwscbu5hdCp1Fw3wHFDatgyhPj1pJruKe+O3c
+AebF5yQOAsCxAk8ZcwGLmmF5xK7lAeux2Qzu1B4Pkfxi97g1GVLnX+so7PR+vvkQ
++OMzQGIWXtaOqov5q2O1N5RJzng/kCjC/QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/destroy b/retiolum/hosts/destroy
index 9f624c6f..8b5f7f5a 100644
--- a/retiolum/hosts/destroy
+++ b/retiolum/hosts/destroy
@@ -1,5 +1,6 @@
Subnet = 42:9277:1f1e:7599:ae4b:7cca:b4a3:fe47/128
-Subnet = 42.24.21.32/32
+Subnet = 10.243.0.31/32
+Compression = 9
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAofIF/j4ddJEG0sOJJNp6hVXqLpj9FPw6a1vLLqZsn/NuZi3QCZ/w
xj1nIsQbc1TnPLluHhpn5kuvzb0lThqmPJvX2uXnbq7WH6OvRyN/FV/Gn40txdni
diff --git a/retiolum/hosts/eigenserv b/retiolum/hosts/eigenserv
index ff61b3f6..f5966794 100644
--- a/retiolum/hosts/eigenserv
+++ b/retiolum/hosts/eigenserv
@@ -1,5 +1,6 @@
Subnet = 42:c9d8:ab9e:c7fe:43ff:0268:f862:42f7/128
-Subnet = 42.136.75.187/32
+Subnet = 10.243.0.32/32
+Compression = 9
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAyy060LWeo6Z+Kp2h5LtyMx+KGdxL9/WjWfc1yf/YZ8lhZutNb+Kd
u9AHbnrqTRWRslP+toNiC55aJ/KlTBFQA5nBu2DC1KdG71AX5th7bRvUMfEAEG1+
diff --git a/retiolum/hosts/euer b/retiolum/hosts/euer
index 6e965f83..8a38150f 100644
--- a/retiolum/hosts/euer
+++ b/retiolum/hosts/euer
@@ -1,6 +1,6 @@
Address = 84.23.67.119
Subnet = 42:974a:3ecf:3c49:06c0:4cd1:3c6f:59d9/128
-Subnet = 10.243.0.95
+Subnet = 10.243.0.95/32
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEArx2mZOPEfS8fvmQYSzWuMmNtfposJlctDfGVmhMVotaFIpIBcKuL
dHZHI8BAStaM++DuqKv/QBjk9jF6BRAdZqHn98LHXR+VRJmFvgelEFe0uPvIRMe2
diff --git a/retiolum/hosts/fuerkrebs b/retiolum/hosts/fuerkrebs
index 7e7713cc..35bbcf18 100644
--- a/retiolum/hosts/fuerkrebs
+++ b/retiolum/hosts/fuerkrebs
@@ -1,5 +1,5 @@
Subnet = 42:0f19:8a1e:7865:721b:2378:bef7:1159/128
-Subnet = 10.243.0.144
+Subnet = 10.243.0.144/32
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA1HoKqh7HvXCKybe2FNBI/wuOvkZuftL0/DDZfZtPlCRtdcOA4XFj
hQng5+VE3NG0yKcRs59U8iHSeN9b7Is1YF4q0RtM9YQTDhvS/vfpHDq42ftjMs/e
diff --git a/retiolum/hosts/iiso b/retiolum/hosts/iiso
index 63711f9e..3700cec5 100644
--- a/retiolum/hosts/iiso
+++ b/retiolum/hosts/iiso
@@ -1,5 +1,6 @@
Subnet = 42:b2cd:6c75:d528:e736:ec4e:fc39:8bdc/128
-Subnet = 42.251.230.3/32
+Subnet = 10.243.0.37/32
+Compression = 9
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAvsjBR0FUkjiNNLhz3AArosLqEiLZY7O8L6LorfUplD/IjG9P7XXx
ry4gbKEH57GPn11IOPP1AKQcz7SfW7EwvUS8U1IZgkQq8BuuD3oGBQxOqwnOwzVN
diff --git a/retiolum/hosts/miefda b/retiolum/hosts/miefda
new file mode 100644
index 00000000..1de261d9
--- /dev/null
+++ b/retiolum/hosts/miefda
@@ -0,0 +1,11 @@
+Subnet = 10.243.0.30
+Subnet = 42:59fd:1f99:d9b4:9fda:dd80:ff61:6497/128
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAtWySxln5f1ibnguV9FPOGvw15Xn+9HG5qRDv8buu30YGdJ8yaq6L
+LwjZjNJ+fbHx5lNkDcD+qZXGi/jBiIFPOnAlNZwcOSlBtlplLX6/2H2Ix3RTrhUm
+Dh2s0VLGBPZ+tNO4TtR/RyYJVfVYN6BrKhAWGkffeo0bHFIpiAOQyr1bmbFUMs6q
+0SzX987ey3STDVPdiTNHW7ogFS/18QwOcI4eYVoYK6jgPvutNYt5lpP5qRczgCpd
+Ra+cZk9Lx1mbS1jEAhCYDmqmEqlA2p2ceTOHibjOMzOPkkzEcIwntP4iU+26E4aW
+YS4snJDR9bMXk85rY5Huo9jq7z95T788WQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/miefda901 b/retiolum/hosts/miefda901
deleted file mode 100644
index ab25a691..00000000
--- a/retiolum/hosts/miefda901
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:0:0:0:0:0:111:efda/128
-Subnet = 42.85.219.211/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEApbEYmHf0vEDYa/2aVvWVxEGgC+JJlXcArdxkQooSIpnZfSAfsH0S
-MFz8v7UkM7EJSwDsFWf+gxyoAORdFpdQm+XQoDqWVZ1e0isYtNluP2C/51s3lu2F
-kVLZ+86el7zd4unHG+6CHmyaBcO5yV6VU8WFeuinB2+ojnujOWlHgOipMOrxsab8
-vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQnvsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7h
-Bv6prIxCbpY7WMMtg0z+OlyGkQefVRl18kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnN
-VoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4nwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/miefdahome b/retiolum/hosts/miefdahome
deleted file mode 100644
index c21ba679..00000000
--- a/retiolum/hosts/miefdahome
+++ /dev/null
@@ -1,9 +0,0 @@
-Subnet = 42.37.203.172/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAtKNWDTK92VGAqfkoy+cWscq3Gp3UJv+NldFGny/PZHG7/0zT7Fri
-VDG+XhVkY5lXz2FyRWPsxwZBEQJlnjswx5zpNsjwCS29a4fTw9lnc26KRSXfGW56
-V/ow2xaPF+n6e9aebOf660FfK10RcBsBAJ956UelahiuwTTXqEnnA0zA0tpJWAdU
-KG+jYARZj2kGy+Trr1ud/PUUXoy+pxID0SW0Xj0l1soxkNEPf2kLwBpaQrwI7uxf
-VI+chpR7ZXJOEBj2vevIVOtxX6X9TubEp3WQfiQzOHB1uW8okHI0wEY5zwrozga/
-xAFGktiwuux1pNdcCUyZmvhTKkHS6gyw4wIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/minikrebs b/retiolum/hosts/minikrebs
new file mode 100644
index 00000000..ad7278e2
--- /dev/null
+++ b/retiolum/hosts/minikrebs
@@ -0,0 +1,10 @@
+Subnet = 10.243.1.1/32
+Subnet = 42:0:0:0:0:0:1:1/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA0fu8F+XJ6hHsIj8QtdSZIhE+Ae2sEIY4dHcnHbCOeHJlOQQDJrme
+frmG65BX4BMcClUyhvvMwlZIerFwsJoEwa39lB3/Y58OwSS9cNCZTShQPbyVy5wo
+oS97tVUyQENMELXgodg7CUNaloVXGOyXgCOkfYOb5CpWi8NXNsSE1CjZc1XZNI2Q
+2dFBzp6FtRcKc5x5xWuUMnw1Ll2upW2uHZWfgRtgv+pzxVTiNvDqACu8Klwj0bls
+B87DEYeUmiC+CioOtyhiQimUGE8lU1aMaqCyfSsqeBEclSvOCnpaEQu4j6aiY8SE
+5Gm+rteYWKfK2LYV2NOg7n9AUR6d0v8P2wIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/pico b/retiolum/hosts/pico
index 83a465a4..8fc732b8 100644
--- a/retiolum/hosts/pico
+++ b/retiolum/hosts/pico
@@ -1,4 +1,5 @@
-Subnet = 42.0.0.42
+Address = pu11.de
+Subnet = 10.243.0.102/32
Subnet = 42:b103:275c:1723:edc8:b24d:452b:352a/128
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsbe4wzTOHHLyuPO/AsfDqQHyV41qgs3dqt6uWcDcdiEsUvbCK9Ch
diff --git a/retiolum/hosts/pornocauster b/retiolum/hosts/pornocauster
index 83374198..cc7d8955 100644
--- a/retiolum/hosts/pornocauster
+++ b/retiolum/hosts/pornocauster
@@ -1,5 +1,5 @@
Subnet = 42:0b2c:d90e:e717:03dc:9ac1:7c30:a4db/128
-Subnet = 10.243.0.91
+Subnet = 10.243.0.91/32
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAnztrijsfao+fmNtwAjqwIDKsRaMP3ECsq2T2zqKvxwCyXk69G9bG
RFhWjgaawS9ZhnHSlgWK/vtoR0O9NxpzdU/mvdQijbVGxM02DegjO9qDSIe8EGmA
diff --git a/retiolum/hosts/taschenkrebs b/retiolum/hosts/taschenkrebs
index 07be2450..94c37ead 100644
--- a/retiolum/hosts/taschenkrebs
+++ b/retiolum/hosts/taschenkrebs
@@ -1,4 +1,4 @@
-Subnet = 10.243.0.66
+Subnet = 10.243.0.66/32
Subnet = 42:55bf:5f2b:73f4:f989:910e:ee73:2831/128
-----BEGIN RSA PUBLIC KEY-----
diff --git a/retiolum/openwrt/tinc-up b/retiolum/openwrt/tinc-up
new file mode 100755
index 00000000..3b8bb978
--- /dev/null
+++ b/retiolum/openwrt/tinc-up
@@ -0,0 +1,19 @@
+# source: krebscode/painload/retiolum/scripts/tinc_setup/tinc-up
+
+dirname="`dirname "$0"`"
+
+conf=$dirname/tinc.conf
+
+name=`sed -n 's|^ *Name *= *\([^ ]*\) *$|\1|p' $conf`
+
+host=$dirname/hosts/$name
+
+addr4=`sed -n 's|^ *Subnet *= *\(10[.][^ ]*\) *$|\1|p' $host`
+if [ "$addr4" != '' ];then
+ ifconfig $INTERFACE $addr4
+ route add -net 10.243.0.0 netmask 255.255.0.0 dev retiolum
+else
+ addr4=`sed -n 's|^ *Subnet *= *\(42[.][^ ]*\) *$|\1|p' $host`
+ ifconfig $INTERFACE $addr4
+ route add -net 42.0.0.0 netmask 255.0.0.0 dev retiolum
+fi
diff --git a/retiolum/openwrt/updater b/retiolum/openwrt/updater
new file mode 100755
index 00000000..4dbc7d78
--- /dev/null
+++ b/retiolum/openwrt/updater
@@ -0,0 +1,6 @@
+#!/bin/sh
+cd /etc/tinc/retiolum/hosts
+wget http://vpn.miefda.org/hosts.tar.gz
+tar xzf hosts.tar.gz
+rm hosts.tar.gz
+tincd -n retiolum -kHUP
diff --git a/retiolum/scripts/tinc_setup/write_channel.py b/retiolum/scripts/tinc_setup/write_channel.py
index 53a155d9..8299fa8d 100644
--- a/retiolum/scripts/tinc_setup/write_channel.py
+++ b/retiolum/scripts/tinc_setup/write_channel.py
@@ -3,7 +3,7 @@ import random, sys, time, socket
try:
myname=sys.argv[1]
except:
- print "you are made of stupid"
+ print("you are made of stupid")
exit (23)
CHANNEL = '#krebsco'
@@ -12,10 +12,10 @@ FILE="/etc/tinc/retiolum/hosts/"+myname
PORT=6667
NICK= myname+"_"+str(random.randint(23,666))
-print "Connecting..."
+print("Connecting...")
sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
sock.connect((HOST,PORT))
-print NICK
+print(NICK)
sock.send("NICK %s\r\n" % NICK)
sock.send("USER %s %s bla : %s\r\n" %(NICK,HOST,NICK))
sock.send("JOIN %s\r\n" % CHANNEL)
@@ -23,5 +23,5 @@ time.sleep(23)
f = open(FILE,'r')
a = [ sock.send("PRIVMSG %s : %s" % ( CHANNEL,line)) for line in f]
time.sleep(5) #because irc is so lazy
-print "closing socket"
+print("closing socket")
sock.close()
diff --git a/streams/stream.db b/streams/stream.db
index 711c5f30..cdf1c329 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -1,8 +1,6 @@
-http://somafm.com/groovesalad.pls groove
http://deepmix.ru/deepmix128.pls deepmix
http://streams.xenim.de/radiotux.ogg radiotux
http://bassdrive.com/v2/streams/BassDrive.pls bassdrive
-http://somafm.com/illstreet.pls illstreet
http://localhost:8000/stream.ogg icecast
http://localhost:8000/shice.ogg shice
http://stream2.jungletrain.net:8000 jungletrain
@@ -12,3 +10,25 @@ http://radio.krautchan.net:8000/radio.mp3 radiofreieskrautchan
http://nl1.streamhosting.ch/listen.pls lounge
http://deluxetelevision.com/livestreams/radio/DELUXE_RADIO.pls deluxe
http://livestream.radiodarmstadt.de:8000 darmstadt
+http://somafm.com/sxfm.pls southbysoma
+http://somafm.com/indiepop.pls indypop
+http://somafm.com/poptron.pls poptron
+http://somafm.com/480min.pls 480min
+http://somafm.com/u80s.pls underground80s
+http://somafm.com/secretagent.pls secretagent
+http://somafm.com/suburbsofgoa.pls suburbsofgoa
+http://somafm.com/beatblender.pls beatblender
+http://somafm.com/missioncontrol.pls missioncontrol
+http://somafm.com/dronezone.pls dronezone
+http://somafm.com/cliqhop.pls cliqhop
+http://somafm.com/spacestation.pls spacestationsoma
+http://somafm.com/bootliquor.pls bootliquor
+http://somafm.com/covers.pls covers
+http://somafm.com/illstreet.pls illstreet
+http://somafm.com/tags.pls tagstrip
+http://somafm.com/groovesalad.pls groove
+http://somafm.com/lush.pls lush
+http://somafm.com/digitalis.pls digitalis
+http://somafm.com/sonicuniverse.pls sonicuniverse
+http://somafm.com/doomed.pls doomed
+http://somafm.com/brfm.pls blackrockfm
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:06:20 +0000