update config files to not use opport

svn:r300

diff --git a/src/config/moria1-orrc b/src/config/moria1-orrc
index 710ac0e8e4f0f6f1169dd566a4101fdbe74b5435..2f8c4cadcdeb5ff87498a55019ee09cde838fce7 100644 (file)
--- a/src/config/moria1-orrc
+++ b/src/config/moria1-orrc
@@ -1,5 +1,7 @@
 # Configuration file for or
 
+OnionRouter 1
+
 # List of routers
 RouterFile ../config/routers.or
 
@@ -10,7 +12,6 @@ SigningPrivateKeyFile moria1-private
 CoinWeight 0.01
 
 ORPort 9001
-OPPort 9011
 APPort 9021
 DirPort 9031
 

diff --git a/src/config/moria2-orrc b/src/config/moria2-orrc
index 4fd9b7758283a3f963b077a2a7d8022ec66dfc44..23f3c023c1c54d389024d9872e71e11a931fea1d 100644 (file)
--- a/src/config/moria2-orrc
+++ b/src/config/moria2-orrc
@@ -1,5 +1,7 @@
 # Configuration file for or
 
+OnionRouter 1
+
 # List of routers
 RouterFile ../config/routers.or
 
@@ -10,7 +12,6 @@ SigningPrivateKeyFile moria2-private
 CoinWeight 0.01
 
 ORPort 9002
-OPPort 9012
 APPort 9022
 DirPort 9032
 

diff --git a/src/config/moria3-orrc b/src/config/moria3-orrc
index 2593bf42b30c6df82a52b189f59fe5d59b207f3a..52467f0392447f0829ab97dc983f79781e201a69 100644 (file)
--- a/src/config/moria3-orrc
+++ b/src/config/moria3-orrc
@@ -1,5 +1,7 @@
 # Configuration file for or
 
+OnionRouter 1
+
 # List of routers
 RouterFile ../config/routers.or
 
@@ -10,7 +12,6 @@ SigningPrivateKeyFile moria3-private
 CoinWeight 0.01
 
 ORPort 9003
-OPPort 9013
 APPort 9023
 DirPort 9033
 

diff --git a/src/config/oprc b/src/config/oprc
index 4a86c4d6c7c645c4047a10ae5bd3580938c7b4e8..5d17d26d2d1b14da903633db34b56a7aff1bd5b3 100644 (file)
--- a/src/config/oprc
+++ b/src/config/oprc
@@ -16,7 +16,6 @@ CoinWeight 0.01
 # Ports for various services. Comment out if you're not running that
 # service.
 #ORPort 9001
-#OPPort 9011
 APPort 9050
 
 # Maximum number of sockets (of any sort) this node can have open

diff --git a/src/config/routers.or b/src/config/routers.or
index 614b9fb7cac76b348f7878eb80163372a04f1a14..f9ecf7290bc6597c7c92c527393a78000d26fd4c 100644 (file)
--- a/src/config/routers.or
+++ b/src/config/routers.or
@@ -19,6 +19,7 @@ MIGJAoGBAMBBuk1sYxEg5jLAJy86U3GGJ7EGMSV7yoA6mmcsEVU3pwTUrpbpCmwS
 7BvovoY3z4zk63NZVBErgKQUDkn3pp8n83xZgEf4GI27gdWIIwaBjEimuJlEY+7K
 nZ7kVMRoiXCbjL6VAtNa4Zy1Af/GOm0iCIDpholeujQ95xew7rQnAgMA//8=
 -----END RSA PUBLIC KEY-----
+accept *:*
 
 # Router 2
 router moria.mit.edu 9002 9012 9022 9032 1000000