From 2d45f657f2e89f30f09807a834a4b07596479733 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 26 Dec 2011 23:41:28 +0100 Subject: //retiolum/hosts kremium now in 10.243.x.x namespace --- retiolum/hosts/kremium | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/hosts/kremium b/retiolum/hosts/kremium index eb47867a..9f77be25 100644 --- a/retiolum/hosts/kremium +++ b/retiolum/hosts/kremium @@ -1,5 +1,5 @@ Subnet = 42:88ec:8968:cc6b:978a:68b7:1004:fc8a/128 -Subnet = 42.135.197.75/32 +Subnet = 10.243.0.98/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsdjqCyLvGfkIsawGji1CIIxGaKKdFhKJcfFK8FWiyQdgeNK/9UAh XsJYkSHVcXqHAorP1QAvk5fIiSEEoSwoChyecqpNOREOnN8+N8RVrs0QIwL0mwa0 -- cgit v1.2.3 From b3c427c89a49cd8b9391d1dc4d0360dd06554c57 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 26 Dec 2011 23:45:43 +0100 Subject: //retiolum/tinc_setup: now using 10.243.x.x namespace' --- retiolum/scripts/tinc_setup/install.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index 1cd7c81d..a6b50b8a 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -39,7 +39,7 @@ then # myipv4=$(echo 42.$(for i in `seq 1 3`; do echo "ibase=16;`bin/fillxx xx|tr [a-f] [A-F]`" | bc; done)|tr \ .)/32 myipv4="${2:-}" - mynet4=42.0.0.0 + mynet4=10.243.0.0 if [ ! "$myipv4" ] then @@ -50,7 +50,7 @@ then printf 'select unused v4 subnet ip (1-255): ' read v4num done - myipv4="42.0.0.$v4num" + myipv4="10.243.0.$v4num" fi echo "Subnet = $myipv4" > hosts/$myname @@ -62,8 +62,7 @@ fi cat>tinc.conf< Date: Tue, 27 Dec 2011 05:16:15 +0100 Subject: priv-key lost --- retiolum/hosts/TodesBrot | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/retiolum/hosts/TodesBrot b/retiolum/hosts/TodesBrot index c7f138f1..f590e15e 100644 --- a/retiolum/hosts/TodesBrot +++ b/retiolum/hosts/TodesBrot @@ -1,9 +1,10 @@ Subnet = 10.243.0.12/32 + -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA0VQz7tgltBiJgHBfhHLYukrdeQ9K8k3wqrksaqrOtj5ZqN98HoBP -Trt3bKWNxx0Geszlum7ONpekqmBJN/SUsDaO1rGwY654qFsSWctvg4Pnr0k/6R91 -QCdSklfh19oz+pGY5i4HnZpTouyNnN/AaKP7fqeNsf6AOMO18daODVC5FF43ftHH -L0ZAjOB6YDhGl+CVBTlFG6HMp81yDAlm7PZEVsd4VRMdQDdx/f6rO9pzkRQmwI/s -cQjDHEBp5R0bxH5w+8wj1SBusHPYL2UuzQqRNsBzCmAubSi6F2GqPjuUpbZm2trE -fo2j/RFV/1EPeDo5BsNW4zzRcNgxuOjV9QIDAQAB +MIIBCgKCAQEAzGIijXaoIRG09v5sIXyVdqdpDruPMqKJfvZUXCF/POMCZEsZ4tjd +jHHdbTfREExvSNBUxS6GaYwg/HR2R7nprzOazSN9kzp9fmFJofbCOxz6X/8O/fMM +gTBmZzYu4cfysjTD5tsrJp/dQOZ0wKpUXBOWWWDUTLM9Zo3+6Bxe/6pN+gphvl6m +ReIAwl34QkZ24mq1W4YZofU2PxLxnhtuBgXuJRfn8FDlgKKPhPpKX070J5pamzpp +1/Idxl0zTmoKeXWhJ0wY0SNeglaWgH1P2EeNUNoVEX4Egk4XQGkzOfShRG7zoJMA +tKJlNZOw/4EF3E/IM8mG1yG3NqtFlIyNYQIDAQAB -----END RSA PUBLIC KEY----- -- cgit v1.2.3 From cc830e1dab02d1069d2cd225a0f6aa7f8c548ef4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Dec 2011 05:19:48 +0100 Subject: more fixed --- retiolum/hosts/TodesBrot | 1 - 1 file changed, 1 deletion(-) diff --git a/retiolum/hosts/TodesBrot b/retiolum/hosts/TodesBrot index f590e15e..f76b72b2 100644 --- a/retiolum/hosts/TodesBrot +++ b/retiolum/hosts/TodesBrot @@ -1,5 +1,4 @@ Subnet = 10.243.0.12/32 - -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAzGIijXaoIRG09v5sIXyVdqdpDruPMqKJfvZUXCF/POMCZEsZ4tjd jHHdbTfREExvSNBUxS6GaYwg/HR2R7nprzOazSN9kzp9fmFJofbCOxz6X/8O/fMM -- cgit v1.2.3 From a6aa0a7b89f663c93c9c44b6b7851bf2606be554 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Dec 2011 11:04:26 +0100 Subject: added armageddon --- retiolum/hosts/ThinkArmageddon | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 retiolum/hosts/ThinkArmageddon diff --git a/retiolum/hosts/ThinkArmageddon b/retiolum/hosts/ThinkArmageddon new file mode 100644 index 00000000..cec62e11 --- /dev/null +++ b/retiolum/hosts/ThinkArmageddon @@ -0,0 +1,9 @@ +Subnet = 10.243.0.137 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1EAiyBWICkyB1zHE31fHSbGR1nJJmXSfnrqm9yXRZSGweIKrbsof +QVcRzM4vsFBRUMBeKW7fzlGcvgXULFRnGelvEl4GRiBMO9odBlBI3t8CjZW7X2N7 +JqCMkB+CRuiHbNYQdRFTozQEfPq+DNh8accD5LjUM6gF0dKUdby5qNeHCfZSxU4v +YZDRqq/haO4up6m8/S6YhnHPOSaIAu7R7hFaUeB/FPT+s5irKk6WtAiWnIdXb22q +0zxT4+t9sWFb4V9u/MImggYQVWjk+TfF5KpihBOvExEQsSR8JJcRUJAtN4W0w2Pc +S4/j9ArKcBj5Wf2qHcJMN5MbwUFW1oMkGwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 03159864f143a44a203e47e7d03887d859608cdd Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Dec 2011 15:14:45 +0100 Subject: now with enterprise ip --- retiolum/hosts/supernode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index 6058557a..f6806504 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,4 +1,4 @@ -Address = miefda.org +Address = 46.252.21.5 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 10.243.0.1/32 Subnet = 0.0.0.0/0 -- cgit v1.2.3 From 09d77c782e149b73a5b1cb0a8d1e67825111ae89 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Dec 2011 15:28:18 +0100 Subject: //retiolum/Makefile: rewrite tinc-up only when upgrading --- retiolum/Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/retiolum/Makefile b/retiolum/Makefile index e0268c35..c77546df 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -7,26 +7,23 @@ all: update links links: for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done -hosts: - bin/update-retiolum-hosts || true -install: update +install: upgrade ../punani/bin/punani -Eih tinc /usr/bin/python /usr/bin/python2 scripts/tinc_setup/install.sh cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up scripts/autostart/create-startup.sh -update: hosts - bin/update_tinc_hosts "create magic" || true - bin/update_tinc_hosts restart +upgrade: update if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \ sudo bin/restart-tincd; \ - else \ - sudo pkill -HUP tincd || :; \ fi -arch-install: update install arch-autostart autohosts +update: hosts + bin/update_tinc_hosts "create magic" || true + bin/update_tinc_hosts restart + sudo pkill -HUP tincd || :; -arch-autostart: - make -C scripts/autostart arch || true +hosts: + bin/update-retiolum-hosts || true -- cgit v1.2.3 From e7874d7c84560a9d8e67bb19aadb5e31a60214fd Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Dec 2011 15:54:18 +0100 Subject: deleted stupid cloudkrebs --- retiolum/hosts/cloudkrebs | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 retiolum/hosts/cloudkrebs diff --git a/retiolum/hosts/cloudkrebs b/retiolum/hosts/cloudkrebs deleted file mode 100644 index fd70c09b..00000000 --- a/retiolum/hosts/cloudkrebs +++ /dev/null @@ -1,11 +0,0 @@ -Address = tinc.krebs.dotcloud.com -Port = 1655 -Subnet = 42.176.135.119/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA9j7kF3Vf9POQbY16LTkpxLvGFlxQ7uEOKmiZFjLfhBi9yt49n+Oj -hWcr2Pf0iSBhBBqLja429aDe9DXswYUlDwDGau9o6aGWL9mvKBOZ92nXqHT2xv/p -3V9hCTpV0sAIVNkV/ywRJrxbmKAAGicfdB+TuYWzxSAC6TX/0OdRiSUXqmIpL4xk -XrjwO7g2iyXYjHpnstsxKtvDCBY2HHGT+PMherjiyD1GUWygq5hKRIXTdb2vauxa -eao1C3ICkKWrmytYEi/5rLUljBlRqCVyd1Zls/Dfx5VR3ptvFM6u8nUdVW7RYmph -t86XSPtor97v9xxu+lmLJWIWu1DjDo1XpQIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From 33709618ff387d5770e3b015751b7fdd28f4d39f Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Dec 2011 16:18:29 +0100 Subject: new Krebs news Candidate --- cholerab/news/Candidate | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 cholerab/news/Candidate diff --git a/cholerab/news/Candidate b/cholerab/news/Candidate new file mode 100644 index 00000000..a24d565b --- /dev/null +++ b/cholerab/news/Candidate @@ -0,0 +1,13 @@ +hosts for deletion: +zerg +rtjure +miefda901 +krebsnode +urkrebs +pa_sharepoing +krebsbob +chinaman +temperator +miefdahome +krebsbitch +armageddon421_de -- cgit v1.2.3 From f4b8bb2907e346f50e129ee35066cc41ce1ce157 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 27 Dec 2011 16:20:32 +0100 Subject: //retiolum/Makefile: update punani --- retiolum/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/Makefile b/retiolum/Makefile index c77546df..cd0a543c 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -9,7 +9,7 @@ links: install: upgrade - ../punani/bin/punani -Eih tinc /usr/bin/python /usr/bin/python2 + ../punani/bin/punani tinc python scripts/tinc_setup/install.sh cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up scripts/autostart/create-startup.sh -- cgit v1.2.3 From 1a6878bc3ed3996a82b611742cb0b2829d8a7c53 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Dec 2011 16:20:31 +0100 Subject: fixed --- retiolum/scripts/routing/defaultroute.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/scripts/routing/defaultroute.sh b/retiolum/scripts/routing/defaultroute.sh index b7d703e8..a9e227a6 100755 --- a/retiolum/scripts/routing/defaultroute.sh +++ b/retiolum/scripts/routing/defaultroute.sh @@ -34,7 +34,7 @@ esac cat $tincdir/hosts/* | grep Address | cut -b 11- | while read host do - if [ "$(echo $host | sed 's/[0-9]*//g' | sed 's/>//g')" = '' ]; then + if [ "$(echo $host | sed 's/[0-9]*//g' | sed 's/\.//g')" = '' ]; then route $command $host gw $defaultroute else host -4 $host | grep "has address" | awk '{ print $4 }' | -- cgit v1.2.3 From 82f10844f291f1a26964fe25306db4db5c54b806 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 28 Dec 2011 12:43:02 +0100 Subject: added ip-ranges for routing --- retiolum/doc/routing/ip-ranges | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 retiolum/doc/routing/ip-ranges diff --git a/retiolum/doc/routing/ip-ranges b/retiolum/doc/routing/ip-ranges new file mode 100644 index 00000000..06f23e4e --- /dev/null +++ b/retiolum/doc/routing/ip-ranges @@ -0,0 +1,5 @@ +youtube + 209.85.0.0/16 + 208.65.0.0/16 + + -- cgit v1.2.3 From f98c539c97687b30f55881e4b6800d33b3ccf2a8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 28 Dec 2011 15:07:42 +0100 Subject: more COMPRESSION-!! --- retiolum/hosts/supernode | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index f6806504..354beba0 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -2,6 +2,7 @@ Address = 46.252.21.5 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 10.243.0.1/32 Subnet = 0.0.0.0/0 +Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj -- cgit v1.2.3 From 6b5e8e145343adaf0376b3dd80943c42fd839186 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 28 Dec 2011 18:36:56 +0100 Subject: more ip testing --- retiolum/hosts/supernode | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index 354beba0..d865a934 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,6 +1,7 @@ Address = 46.252.21.5 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 10.243.0.1/32 +Subnet = 10.243.1.23/32 Subnet = 0.0.0.0/0 Compression = 9 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From 8d5d4f3059f54b06a984f854845b3458fd8a05ce Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 28 Dec 2011 18:39:51 +0100 Subject: the enterprise network presents: multiple ip --- retiolum/hosts/supernode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index d865a934..1f22b6fc 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,7 +1,7 @@ Address = 46.252.21.5 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 10.243.0.1/32 -Subnet = 10.243.1.23/32 +Subnet = 10.243.142.0/24 Subnet = 0.0.0.0/0 Compression = 9 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From 623c7f5ef31a1c088d276be23a2bf64ed7afaed1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Dec 2011 17:38:25 +0100 Subject: removed routing fu --- retiolum/hosts/supernode | 1 - 1 file changed, 1 deletion(-) diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index 1f22b6fc..354beba0 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,7 +1,6 @@ Address = 46.252.21.5 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 10.243.0.1/32 -Subnet = 10.243.142.0/24 Subnet = 0.0.0.0/0 Compression = 9 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From 6554c968a77faa4a3e55632f7b92411a108e5275 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Dec 2011 17:43:56 +0100 Subject: added new hostsfile --- retiolum/hosts/USgw | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/USgw diff --git a/retiolum/hosts/USgw b/retiolum/hosts/USgw new file mode 100644 index 00000000..b134c7dc --- /dev/null +++ b/retiolum/hosts/USgw @@ -0,0 +1,11 @@ +Subnet = 10.243.142.1/32 +Subnet = 0.0.0.0/0 +Compression = 9 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP +sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj ++0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 +1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I +b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z +rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From e147881902450b9d6ce072c9c903f00ed8cf323d Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 29 Dec 2011 20:14:48 +0100 Subject: //retiolum/hosts/filebitch: new ip range --- retiolum/hosts/filebitch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/hosts/filebitch b/retiolum/hosts/filebitch index ad61c167..523ff7ff 100644 --- a/retiolum/hosts/filebitch +++ b/retiolum/hosts/filebitch @@ -1,5 +1,5 @@ Subnet = 42:0356:a364:cc79:4c96:2c7c:13fc:0c5b/128 -Subnet = 42.150.131.98/32 +Subnet = 10.143.131.98/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAoqTUa54dkplzU6IqWdvCiGM8FLpZ6X6AmgGgl5r9RZ+Af08iy4Js FPdco+1Lj5OthXJnd5Xx8cO5qQx5CRzUN59ec8o0jxQOBZ5EpuN42RLMmQNBJWm7 -- cgit v1.2.3 From 8e676124bb26e82c76974dea6e6938fa94116bb9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Dec 2011 20:58:40 +0100 Subject: routing doku --- retiolum/doc/routing/tun | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 retiolum/doc/routing/tun diff --git a/retiolum/doc/routing/tun b/retiolum/doc/routing/tun new file mode 100644 index 00000000..a83ffc27 --- /dev/null +++ b/retiolum/doc/routing/tun @@ -0,0 +1,30 @@ +tunneling: +ovpn relevant fixes: + + -up /etc/openvpn/update-resolv-conf + -down /etc/openvpn/update-resolv-conf + +#up /etc/openvpn/update-resolv-conf + +#down /etc/openvpn/update-resolv-conf + + +route-nopull + -redirect-gateway $def1 + -dev tun + +dev $(your interfacename here) + +dev-type tun + + -auth-user-pass + +auth-user-pass $(your openvpn user_pass_file here) + +normal firewall stuff: + shorewall: + in /etc/shorewall/interfaces + +loc $(interfacename) detect tcpflags,nosmurfs,routefilter,logmartians + +ip+iptables + iptables --table nat -A POSTROUTING -o $(your interfacename here) -j MASQUERADE + ip route add table $(interfacename) via $(route -n | grep $(interfacename) | grep 0.0.0.0 | awk '{print $1}') dev $(interfacename) + ip rule add $(your rule spec here) table $(interfacename) + + + + -- cgit v1.2.3 From 1ef9ac573f0375c8f64599aa1b6ecaad0d44e742 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Dec 2011 22:31:08 +0100 Subject: more routing fu --- retiolum/hosts/MIgw | 11 +++++++++++ retiolum/hosts/USgw | 2 +- retiolum/hosts/supernode | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 retiolum/hosts/MIgw diff --git a/retiolum/hosts/MIgw b/retiolum/hosts/MIgw new file mode 100644 index 00000000..b134c7dc --- /dev/null +++ b/retiolum/hosts/MIgw @@ -0,0 +1,11 @@ +Subnet = 10.243.142.1/32 +Subnet = 0.0.0.0/0 +Compression = 9 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP +sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj ++0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 +1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I +b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z +rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/USgw b/retiolum/hosts/USgw index b134c7dc..5dde5250 100644 --- a/retiolum/hosts/USgw +++ b/retiolum/hosts/USgw @@ -1,4 +1,4 @@ -Subnet = 10.243.142.1/32 +Subnet = 10.243.142.2/32 Subnet = 0.0.0.0/0 Compression = 9 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index 354beba0..46ce7828 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,7 +1,6 @@ Address = 46.252.21.5 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 10.243.0.1/32 -Subnet = 0.0.0.0/0 Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -- cgit v1.2.3 From dc6fbbf6140d0c6428f1c6a10ad4452814e0b376 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Dec 2011 23:27:38 +0100 Subject: renamed devices --- retiolum/hosts/gwMI | 11 +++++++++++ retiolum/hosts/gwUS | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 retiolum/hosts/gwMI create mode 100644 retiolum/hosts/gwUS diff --git a/retiolum/hosts/gwMI b/retiolum/hosts/gwMI new file mode 100644 index 00000000..b134c7dc --- /dev/null +++ b/retiolum/hosts/gwMI @@ -0,0 +1,11 @@ +Subnet = 10.243.142.1/32 +Subnet = 0.0.0.0/0 +Compression = 9 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP +sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj ++0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 +1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I +b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z +rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/gwUS b/retiolum/hosts/gwUS new file mode 100644 index 00000000..5dde5250 --- /dev/null +++ b/retiolum/hosts/gwUS @@ -0,0 +1,11 @@ +Subnet = 10.243.142.2/32 +Subnet = 0.0.0.0/0 +Compression = 9 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP +sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj ++0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 +1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I +b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z +rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 498e87ab9ac1b72ed88e356b580767a5e466dddd Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Dec 2011 23:51:00 +0100 Subject: now reachable (hopefully) --- retiolum/hosts/MIgw | 11 ----------- retiolum/hosts/USgw | 11 ----------- retiolum/hosts/gwMI | 2 ++ retiolum/hosts/gwUS | 2 ++ 4 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 retiolum/hosts/MIgw delete mode 100644 retiolum/hosts/USgw diff --git a/retiolum/hosts/MIgw b/retiolum/hosts/MIgw deleted file mode 100644 index b134c7dc..00000000 --- a/retiolum/hosts/MIgw +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 10.243.142.1/32 -Subnet = 0.0.0.0/0 -Compression = 9 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj -+0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 -1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I -b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z -rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/USgw b/retiolum/hosts/USgw deleted file mode 100644 index 5dde5250..00000000 --- a/retiolum/hosts/USgw +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 10.243.142.2/32 -Subnet = 0.0.0.0/0 -Compression = 9 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj -+0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 -1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I -b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z -rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/gwMI b/retiolum/hosts/gwMI index b134c7dc..331cb660 100644 --- a/retiolum/hosts/gwMI +++ b/retiolum/hosts/gwMI @@ -1,3 +1,5 @@ +Address = 46.252.21.5 +Port = 10601 Subnet = 10.243.142.1/32 Subnet = 0.0.0.0/0 Compression = 9 diff --git a/retiolum/hosts/gwUS b/retiolum/hosts/gwUS index 5dde5250..e9cf9e09 100644 --- a/retiolum/hosts/gwUS +++ b/retiolum/hosts/gwUS @@ -1,3 +1,5 @@ +Address = 56.252.21.5 +Port = 10602 Subnet = 10.243.142.2/32 Subnet = 0.0.0.0/0 Compression = 9 -- cgit v1.2.3 From 2074e5d2407d317cbc25a1bfc59bf71a491e0248 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 30 Dec 2011 00:03:07 +0100 Subject: fixed typo --- retiolum/hosts/gwUS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/hosts/gwUS b/retiolum/hosts/gwUS index e9cf9e09..6c877381 100644 --- a/retiolum/hosts/gwUS +++ b/retiolum/hosts/gwUS @@ -1,4 +1,4 @@ -Address = 56.252.21.5 +Address = 46.252.21.5 Port = 10602 Subnet = 10.243.142.2/32 Subnet = 0.0.0.0/0 -- cgit v1.2.3 From 5849a0f137e476ab61521525f4f157feeb64daa0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 30 Dec 2011 11:29:14 +0100 Subject: changing stuff around --- retiolum/hosts/gwMI | 13 ------------- retiolum/hosts/gwUS | 13 ------------- retiolum/hosts/supernode | 1 + 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 retiolum/hosts/gwMI delete mode 100644 retiolum/hosts/gwUS diff --git a/retiolum/hosts/gwMI b/retiolum/hosts/gwMI deleted file mode 100644 index 331cb660..00000000 --- a/retiolum/hosts/gwMI +++ /dev/null @@ -1,13 +0,0 @@ -Address = 46.252.21.5 -Port = 10601 -Subnet = 10.243.142.1/32 -Subnet = 0.0.0.0/0 -Compression = 9 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj -+0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 -1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I -b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z -rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/gwUS b/retiolum/hosts/gwUS deleted file mode 100644 index 6c877381..00000000 --- a/retiolum/hosts/gwUS +++ /dev/null @@ -1,13 +0,0 @@ -Address = 46.252.21.5 -Port = 10602 -Subnet = 10.243.142.2/32 -Subnet = 0.0.0.0/0 -Compression = 9 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj -+0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 -1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I -b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z -rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index 46ce7828..354beba0 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,6 +1,7 @@ Address = 46.252.21.5 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 10.243.0.1/32 +Subnet = 0.0.0.0/0 Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -- cgit v1.2.3 From db0c9e967e8ff3a96b76293fcf3ea5f7108026ff Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 30 Dec 2011 14:57:35 +0100 Subject: fixed ip --- retiolum/hosts/skirfir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/hosts/skirfir b/retiolum/hosts/skirfir index 880376c9..0214e7a1 100644 --- a/retiolum/hosts/skirfir +++ b/retiolum/hosts/skirfir @@ -1,4 +1,4 @@ -Subnet = 42.0.0.222 +Subnet = 10.243.0.18/32 Subnet = 42:423b:0f94:6b03:7c3c:593e:67e8:c857/128 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From 0f5edb5dea18c4eb28d1fda4a106b868a23cc614 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 2 Jan 2012 11:12:36 +0100 Subject: now less routing --- retiolum/scripts/routing/defaultroute.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/retiolum/scripts/routing/defaultroute.sh b/retiolum/scripts/routing/defaultroute.sh index a9e227a6..f5a1a465 100755 --- a/retiolum/scripts/routing/defaultroute.sh +++ b/retiolum/scripts/routing/defaultroute.sh @@ -7,7 +7,7 @@ usage() echo "-d deactivate routing" } -defaultroute=$(route -n | grep 'UG[ \t]' | awk '{print $2}') +defaultroute=$(ip route show | grep default | awk '{ print $3 }') tincdir="/etc/tinc/retiolum" if [[ $(id -u) -gt 0 ]]; then @@ -30,17 +30,9 @@ case "$1" in exit 1;; esac - -cat $tincdir/hosts/* | grep Address | cut -b 11- | +cat $tincdir/tinc.conf | grep ConnectTo | cut -b 13- | while read host do - if [ "$(echo $host | sed 's/[0-9]*//g' | sed 's/\.//g')" = '' ]; then - route $command $host gw $defaultroute - else - host -4 $host | grep "has address" | awk '{ print $4 }' | - while read addr - do - route $command $addr gw $defaultroute && echo "$command routing to $addr via $defaultroute" - done - fi + addr=$(cat $tincdir/hosts/$host | grep Address | cut -b 11-) + echo route $command $addr gw $defaultroute done -- cgit v1.2.3