From 83f51b4a662901174922313e2bc1398d5a45fe02 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 29 Jan 2008 22:20:04 +0000 Subject: [PATCH] 2008-01-29 zzz * Addressbook: Change default subscription * ConfigUpdateHandler: Change default news URL * initialNews.xml: Update version to .31 * news.xml: More updates * hosts.txt: Add i2p-projekt.i2p * readme.html: More URL updates * SusiDNS: Change references to default subscription --- apps/addressbook/java/src/addressbook/Daemon.java | 3 ++- .../java/src/net/i2p/router/web/ConfigUpdateHandler.java | 2 +- apps/susidns/src/jsp/index.jsp | 2 +- apps/susidns/src/jsp/subscriptions.jsp | 2 +- history.txt | 9 +++++++++ hosts.txt | 4 ++-- initialNews.xml | 2 +- news.xml | 2 +- readme.html | 5 +++-- router/java/src/net/i2p/router/RouterVersion.java | 2 +- 10 files changed, 22 insertions(+), 11 deletions(-) diff --git a/apps/addressbook/java/src/addressbook/Daemon.java b/apps/addressbook/java/src/addressbook/Daemon.java index 8b2a98da1..e43a02436 100644 --- a/apps/addressbook/java/src/addressbook/Daemon.java +++ b/apps/addressbook/java/src/addressbook/Daemon.java @@ -98,7 +98,8 @@ public class Daemon { AddressBook router = new AddressBook(routerFile); List defaultSubs = new LinkedList(); - defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt"); + // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt"); + defaultSubs.add("http://www.i2p2.i2p/hosts.txt"); SubscriptionList subscriptions = new SubscriptionList(subscriptionFile, etagsFile, lastModifiedFile, defaultSubs, (String) settings diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index b5276de10..9140a65e9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -22,7 +22,7 @@ public class ConfigUpdateHandler extends FormHandler { public static final String PROP_NEWS_URL = "router.newsURL"; // public static final String DEFAULT_NEWS_URL = "http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/news.xml?rev=HEAD"; - public static final String DEFAULT_NEWS_URL = "http://dev.i2p/cgi-bin/cvsweb.cgi/i2p/news.xml?rev=HEAD"; + public static final String DEFAULT_NEWS_URL = "http://complication.i2p/news.xml"; public static final String PROP_REFRESH_FREQUENCY = "router.newsRefreshFrequency"; public static final String DEFAULT_REFRESH_FREQUENCY = 12*60*60*1000 + ""; public static final String PROP_UPDATE_POLICY = "router.updatePolicy"; diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index 90ac4cabb..a62418d2c 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -59,7 +59,7 @@ eepsites announced on other sites if you subscribe to those sites' addressbooks.

(To speak the truth: In its default configuration the addressbook does not poll -additional sites, but dev.i2p only. Subscribing to additional sites is an easy task, +additional sites, but www.i2p2.i2p only. Subscribing to additional sites is an easy task, just add them to your subscriptions file.)

If you have questions about naming in i2p, there is an excellent introduction diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index 939ddb066..af44537e5 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -68,7 +68,7 @@ subscriptions *

The subscription file contains a list of (i2p) URLs. The addressbook application regularly (once per hour) checks this list for new eepsites. Those URLs simply contain the published hosts.txt -file of other people. The default subscription is the hosts.txt from dev.i2p, which is updated infrequently. +file of other people. The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently. So it is a good idea to add additional subscriptions to sites that have the latest addresses.

diff --git a/history.txt b/history.txt index b9ec11b03..407ea5c28 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,13 @@ +2008-01-29 zzz + * Addressbook: Change default subscription + * ConfigUpdateHandler: Change default news URL + * initialNews.xml: Update version to .31 + * news.xml: More updates + * hosts.txt: Add i2p-projekt.i2p + * readme.html: More URL updates + * SusiDNS: Change references to default subscription + 2008-01-28 zzz * news.xml: Updates, still preliminary * ReseedHandler: Change default URL diff --git a/hosts.txt b/hosts.txt index 46f1f9e46..8a2a831b8 100644 --- a/hosts.txt +++ b/hosts.txt @@ -1,7 +1,6 @@ ; TC's hosts.txt guaranteed freshness -; $Id: hosts.txt,v 1.172 2007-11-06 06:26:01 jrandom Exp $ ; changelog: -; (1.194) added true.i2p, krabs.i2p, www.i2p2.i2p +; (1.194) added true.i2p, krabs.i2p, www.i2p2.i2p, i2p-projekt.i2p ; (1.193) added i2host.i2p (was i2phost.i2p) ; (1.192) added trevorreznik.i2p ; (1.191) added trac.i2p @@ -512,3 +511,4 @@ i2host.i2p=FkX89~FOWc2HjTeVerud7hzZCtQNDKqEvMeJiDEnSzneA44hhDEDSbjiDuEWOCPwvgCwr true.i2p=Jeb1Ctlh55wWezbA~sCxYQsreDPS~qFJ6DeNMPl7~Kx0w1Odh8YE3QKrZS7WlNqeoRNJLyPgf7h19Tosb-ATZOPDH7B4pQvI4CdlTv-Uimq4dI71PRRZQr3mCBihW~WtVReDOO3JiDf1Bx225xhTmWp0KYo5AM91EW0TcHi8immHBFB9jcjekPoU~zlVAqy5S07LnS7f7rWtC7kno983Dyi9arWDPmnnzu2QD4mMrH0EkuuoBqwUi1HBUNhTn~lL8KqfSpg9j9q-eqd~eixF3nOlsrxMFuWVV1HOUtyMUTRGEX4i4IDPWmRQeFZ0gmfeBYdad~nG1X7uBVeeEtGSrggnegXoSE4oaIuONNXYORsevZn8UahC~kkNWg1wPQtr57TirhLirkF2qHUuwAqe5G00PIhC0-J8K5Ye0QDd5a1coQT87kBgcqLcbSR1oGIjxv2Ma6970Fv65a2a~YKqZZbuGof5-5-7X48SVhOigmo2c-COyt2rXoQlGQpBWtDsAAAA krabs.i2p=k6qIwzff6s1RiRQQy9O6cliBTfHffKZ2F~pVG8nmCqMxEpPnywynFa9XVS6VBbhxGRAMG~PIb2IaFRYS5GFdM3fnnJ~Cn2AbN-qsqbl6cXExj5Fy9Cd-aPR44XW0NE9qjFPiN~6JUOg0fitF65RmsMrFvHq9LM2zOFxOfnPKVsBJGRpjhp6EPRNrkXvzQTw7x6~kqUJ-VGW0avjrz4EmgT6Wias5z0EPioneKOhG-1NepL8HqEv9ryGt31~kmI1-B0cS8v1riaXH0rZWjJ0VvUFEoJ3sHCir4vsnSf1YQIKMUO~zKlgTVZBsw8P2ILFFihs0g9KMIWVjJqqo0PzCM1O-LW90hirn~Ryh4zOZI-orIiV9Oqu96Fj2bvBYSka11TY7erLOCk64tc5NwxvlJQ3F-lk0ZFGvYuU~l45mi0khFLnDnzhDFtcY6YNLRG8hmv9IR2MrG9TJFfSwXdx11LI-57tkRi9Jw4s8OjLijNNDOJX~rVgwZVVIEQcOhGxkAAAA www.i2p2.i2p=-KR6qyfPWXoN~F3UzzYSMIsaRy4udcRkHu2Dx9syXSzUQXQdi2Af1TV2UMH3PpPuNu-GwrqihwmLSkPFg4fv4yQQY3E10VeQVuI67dn5vlan3NGMsjqxoXTSHHt7C3nX3szXK90JSoO~tRMDl1xyqtKm94-RpIyNcLXofd0H6b02683CQIjb-7JiCpDD0zharm6SU54rhdisIUVXpi1xYgg2pKVpssL~KCp7RAGzpt2rSgz~RHFsecqGBeFwJdiko-6CYW~tcBcigM8ea57LK7JjCFVhOoYTqgk95AG04-hfehnmBtuAFHWklFyFh88x6mS9sbVPvi-am4La0G0jvUJw9a3wQ67jMr6KWQ~w~bFe~FDqoZqVXl8t88qHPIvXelvWw2Y8EMSF5PJhWw~AZfoWOA5VQVYvcmGzZIEKtFGE7bgQf3rFtJ2FAtig9XXBsoLisHbJgeVb29Ew5E7bkwxvEe9NYkIqvrKvUAt1i55we0Nkt6xlEdhBqg6xXOyIAAAA +i2p-projekt.i2p=8ZAW~KzGFMUEj0pdchy6GQOOZbuzbqpWtiApEj8LHy2~O~58XKxRrA43cA23a9oDpNZDqWhRWEtehSnX5NoCwJcXWWdO1ksKEUim6cQLP-VpQyuZTIIqwSADwgoe6ikxZG0NGvy5FijgxF4EW9zg39nhUNKRejYNHhOBZKIX38qYyXoB8XCVJybKg89aMMPsCT884F0CLBKbHeYhpYGmhE4YW~aV21c5pebivvxeJPWuTBAOmYxAIgJE3fFU-fucQn9YyGUFa8F3t-0Vco-9qVNSEWfgrdXOdKT6orr3sfssiKo3ybRWdTpxycZ6wB4qHWgTSU5A-gOA3ACTCMZBsASN3W5cz6GRZCspQ0HNu~R~nJ8V06Mmw~iVYOu5lDvipmG6-dJky6XRxCedczxMM1GWFoieQ8Ysfuxq-j8keEtaYmyUQme6TcviCEvQsxyVirr~dTC-F8aZ~y2AlG5IJz5KD02nO6TRkI2fgjHhv9OZ9nskh-I2jxAzFP6Is1kyAAAA diff --git a/initialNews.xml b/initialNews.xml index b9334aab9..de1302491 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - As you probably know, www.i2p.net and its related sites and services went down January 13 after -a power outage at the hosting service, and did not return fully to service. +a power outage at the hosting facility, and did not return fully to service. While some pages are still available at 66.111.51.110 we have a new official site at diff --git a/readme.html b/readme.html index 9d7d5db83..27873846b 100644 --- a/readme.html +++ b/readme.html @@ -14,7 +14,8 @@ you can:

  • inproxy.tino.i2p and perv.i2p: sites tracking active eepsites
  • forum.i2p: a secure and anonymous connection to forum.i2p.net
    • -
  • www.i2p2.i2p: a secure and anonymous connection to www.i2p2.de
    • +
  • www.i2p2.i2p and mirror i2p-projekt.i2p: + secure and anonymous connections to www.i2p2.de
  • eepsites.i2p: an anonymously hosted search engine of eepsites
  • ugha.i2p: ugha's eepsite, a wiki that anyone can edit, and lots of links
  • fproxy.tino.i2p: Freenet proxy
    • @@ -54,7 +55,7 @@ Detailed instructions for starting your eepsite are on

    Be patient - I2P may be slow to start the first time as it searches for peers. If, after 30 minutes, your Active: connected/recent count has less than 10 connected peers, you should open port 8887 on your firewall for better connectivity. -If you cannot see any eepsites at all (even www.i2p), +If you cannot see any eepsites at all (even www.i2p2.i2p), be sure your browser proxy is set to localhost port 4444. You may also want to review the information on the I2P website, post up messages to the diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index cd7ea20d7..9befb02c6 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -17,7 +17,7 @@ import net.i2p.CoreVersion; public class RouterVersion { public final static String ID = "$Revision: 1.548 $ $Date: 2008-01-08 21:15:43 $"; public final static String VERSION = "0.6.1.30"; - public final static long BUILD = 21; + public final static long BUILD = 22; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);