From df1db163f006edc3d5fc54b4dbb492df69725b08 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 23 Oct 2020 15:50:30 +0000
Subject: [PATCH] i2ptunnel: Remove mtn tunnel (new installs only)

---
 installer/resources/i2ptunnel.config | 82 ++++++++++------------------
 1 file changed, 30 insertions(+), 52 deletions(-)

diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config
index 82ab5df6be..2565ffa838 100644
--- a/installer/resources/i2ptunnel.config
+++ b/installer/resources/i2ptunnel.config
@@ -69,28 +69,6 @@ tunnel.1.option.outbound.lengthVariance=0
 tunnel.1.option.outbound.priority=15
 tunnel.1.startOnLoad=true
 
-# I2P's mtn server
-tunnel.2.name=mtn.i2p-projekt.i2p
-tunnel.2.description=I2P Monotone Server
-tunnel.2.type=client
-tunnel.2.sharedClient=true
-tunnel.2.interface=127.0.0.1
-tunnel.2.listenPort=8998
-tunnel.2.targetDestination=mtn.i2p-projekt.i2p:4691
-tunnel.2.i2cpHost=127.0.0.1
-tunnel.2.i2cpPort=7654
-tunnel.2.option.inbound.nickname=shared clients
-tunnel.2.option.outbound.nickname=shared clients
-tunnel.2.option.i2cp.leaseSetEncType=4,0
-tunnel.2.option.i2cp.reduceIdleTime=900000
-tunnel.2.option.i2cp.reduceOnIdle=true
-tunnel.2.option.i2cp.reduceQuantity=1
-tunnel.2.option.inbound.length=3
-tunnel.2.option.inbound.lengthVariance=0
-tunnel.2.option.outbound.length=3
-tunnel.2.option.outbound.lengthVariance=0
-tunnel.2.startOnLoad=false
-
 # local eepserver
 tunnel.3.name=I2P webserver
 tunnel.3.description=My eepsite
@@ -136,12 +114,38 @@ tunnel.4.type=client
 tunnel.4.sharedClient=true
 
 # postman's POP3 server - see hq.postman.i2p
-tunnel.5.name=pop3.postman.i2p
-tunnel.5.description=pop3 server
+tunnel.2.name=pop3.postman.i2p
+tunnel.2.description=pop3 server
+tunnel.2.i2cpHost=127.0.0.1
+tunnel.2.i2cpPort=7654
+tunnel.2.interface=127.0.0.1
+tunnel.2.listenPort=7660
+tunnel.2.option.inbound.nickname=shared clients
+tunnel.2.option.outbound.nickname=shared clients
+tunnel.2.option.i2cp.leaseSetEncType=4,0
+tunnel.2.option.i2cp.reduceIdleTime=900000
+tunnel.2.option.i2cp.reduceOnIdle=true
+tunnel.2.option.i2cp.reduceQuantity=1
+tunnel.2.option.i2p.streaming.connectDelay=1000
+tunnel.2.option.inbound.length=3
+tunnel.2.option.inbound.lengthVariance=0
+tunnel.2.option.outbound.length=3
+tunnel.2.option.outbound.lengthVariance=0
+tunnel.2.startOnLoad=true
+tunnel.2.targetDestination=pop.postman.i2p:110
+tunnel.2.type=client
+tunnel.2.sharedClient=true
+
+# HTTPS (CONNECT) outproxy
+tunnel.5.name=I2P HTTPS Proxy
+tunnel.5.description=HTTPS proxy for browsing eepsites and the web
+tunnel.5.type=connectclient
+tunnel.5.sharedClient=true
+tunnel.5.interface=127.0.0.1
+tunnel.5.listenPort=4445
+tunnel.5.proxyList=outproxy-tor.meeh.i2p
 tunnel.5.i2cpHost=127.0.0.1
 tunnel.5.i2cpPort=7654
-tunnel.5.interface=127.0.0.1
-tunnel.5.listenPort=7660
 tunnel.5.option.inbound.nickname=shared clients
 tunnel.5.option.outbound.nickname=shared clients
 tunnel.5.option.i2cp.leaseSetEncType=4,0
@@ -154,30 +158,4 @@ tunnel.5.option.inbound.lengthVariance=0
 tunnel.5.option.outbound.length=3
 tunnel.5.option.outbound.lengthVariance=0
 tunnel.5.startOnLoad=true
-tunnel.5.targetDestination=pop.postman.i2p:110
-tunnel.5.type=client
-tunnel.5.sharedClient=true
-
-# HTTPS (CONNECT) outproxy
-tunnel.6.name=I2P HTTPS Proxy
-tunnel.6.description=HTTPS proxy for browsing eepsites and the web
-tunnel.6.type=connectclient
-tunnel.6.sharedClient=true
-tunnel.6.interface=127.0.0.1
-tunnel.6.listenPort=4445
-tunnel.6.proxyList=outproxy-tor.meeh.i2p
-tunnel.6.i2cpHost=127.0.0.1
-tunnel.6.i2cpPort=7654
-tunnel.6.option.inbound.nickname=shared clients
-tunnel.6.option.outbound.nickname=shared clients
-tunnel.6.option.i2cp.leaseSetEncType=4,0
-tunnel.6.option.i2cp.reduceIdleTime=900000
-tunnel.6.option.i2cp.reduceOnIdle=true
-tunnel.6.option.i2cp.reduceQuantity=1
-tunnel.6.option.i2p.streaming.connectDelay=1000
-tunnel.6.option.inbound.length=3
-tunnel.6.option.inbound.lengthVariance=0
-tunnel.6.option.outbound.length=3
-tunnel.6.option.outbound.lengthVariance=0
-tunnel.6.startOnLoad=true
 
-- 
GitLab