From 2869dcbf87380f34a13c81a3d55ab4d6c6dd8655 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@ikn.ethz.ch>
Date: Fri, 28 Nov 2008 12:30:16 +0100
Subject: [PATCH] update ssh tunnels

Signed-off-by: Nico Schottelius <nico@ikn.ethz.ch>
---
 securemail     | 14 ++++++++++----
 securemail.off |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/securemail b/securemail
index a087834..ad5fcfe 100755
--- a/securemail
+++ b/securemail
@@ -9,6 +9,7 @@ POP3=110
 POP3S=995
 IMAP=143
 IMAPS=993
+SMTP=25
 
 # our secured host
 HOST="bruehe.schottelius.org"
@@ -16,15 +17,20 @@ HOST="217.14.64.75"
 HOST="creme.schottelius.org"
 HOST="213.146.113.242"
 HOST="home.schottelius.org"
-HOST="nico@62.65.138.78"
 HOST="nico@77.109.138.222"
+#HOST="nico@62.65.138.78"
 
+#ssh -T -f -C -N -L2342:mx2.schottelius.org:$SMTP 62.65.138.66
 ssh -T -f -C -N -L4242:imaps.schottelius.org:$IMAPS "$HOST"
-ssh -T -f -C -N -L2323:proxy001.exchange.netvs.ch:$IMAP "$HOST"
-ssh -T -f -C -N -L4223:ddba020.netstream.ch:$POP3S "$HOST"
+ssh -T -f -C -N -L2323:mx3.schottelius.org:$IMAPS "$HOST"
 
+# Fernzugriff
+ssh -T -f -C -N -R4242:localhost:22 "$HOST"
+
+#ssh -T -f -C -N -L2323:ddba020.netstream.ch:$POP3S "$HOST"
 #ssh -T -f -C -N -L2342:ddba020.netstream.ch:$IMAP "$HOST"
-#ssh -T -f -C -N -L4242:localhost:$IMAP "$HOST"
+#ssh -T -f -C -N -L2323:proxy001.exchange.netvs.ch:$IMAP "$HOST"
+#ssh -T -f -C -N -L4223:ddba020.netstream.ch:$POP3S "$HOST"
 
 #ssh -T -f -C -N -L2323:smtp.syhosting.ch:$IMAPS "$HOST"
 #ssh -T -f -C -N -L2342:smtp.syhosting.ch:$POP3S "$HOST"
diff --git a/securemail.off b/securemail.off
index 082ab7a..4b661f4 100755
--- a/securemail.off
+++ b/securemail.off
@@ -5,3 +5,4 @@
 #
 
 pkill -f -u nico "ssh -T -f -C -N -L"
+pkill -f -u nico "ssh -T -f -C -N -R"