summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Echolot/Config.pm11
-rw-r--r--Echolot/Stats.pm27
-rw-r--r--NEWS2
-rwxr-xr-xpingd4
-rw-r--r--pingd.conf18
-rw-r--r--templates/mlist.html31
-rw-r--r--templates/mlist2.html31
-rw-r--r--templates/rlist-clear.html60
-rw-r--r--templates/rlist-dsa.html60
-rw-r--r--templates/rlist-rsa.html60
-rw-r--r--templates/rlist.html31
-rw-r--r--templates/rlist2-clear.html60
-rw-r--r--templates/rlist2-dsa.html60
-rw-r--r--templates/rlist2-rsa.html60
-rw-r--r--templates/rlist2.html31
15 files changed, 526 insertions, 20 deletions
diff --git a/Echolot/Config.pm b/Echolot/Config.pm
index 789ccac..8761631 100644
--- a/Echolot/Config.pm
+++ b/Echolot/Config.pm
@@ -1,7 +1,7 @@
package Echolot::Config;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Config.pm,v 1.19 2002/07/10 13:01:03 weasel Exp $
+# $Id: Config.pm,v 1.20 2002/07/10 17:16:45 weasel Exp $
#
=pod
@@ -69,6 +69,7 @@ sub init($) {
ping_new => 1,
show_new => 1,
+ seperate_rlists => 0,
thesaurus => 1,
processmail => 60, # process incomng mail every minute
@@ -114,8 +115,14 @@ sub init($) {
'thesaurusindexfile' => 'templates/thesaurusindex.html',
'mlist' => 'templates/mlist.html',
'mlist2' => 'templates/mlist2.html',
- 'rlist2' => 'templates/rlist2.html',
'rlist' => 'templates/rlist.html',
+ 'rlist-rsa' => 'templates/rlist-rsa.html',
+ 'rlist-dsa' => 'templates/rlist-dsa.html',
+ 'rlist-clear' => 'templates/rlist-clear.html',
+ 'rlist2' => 'templates/rlist2.html',
+ 'rlist2-rsa' => 'templates/rlist2-rsa.html',
+ 'rlist2-dsa' => 'templates/rlist2-dsa.html',
+ 'rlist2-clear' => 'templates/rlist2-clear.html',
},
homedir => undef,
diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm
index 96776a4..438c07e 100644
--- a/Echolot/Stats.pm
+++ b/Echolot/Stats.pm
@@ -1,7 +1,7 @@
package Echolot::Stats;
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Stats.pm,v 1.12 2002/07/06 20:15:12 weasel Exp $
+# $Id: Stats.pm,v 1.13 2002/07/10 17:16:45 weasel Exp $
#
=pod
@@ -275,6 +275,7 @@ sub write_file($$;$) {
$template->param ( list => $output );
$template->param ( CURRENT_TIMESTAMP => scalar gmtime() );
$template->param ( SITE_NAME => Echolot::Config::get()->{'sitename'} );
+ $template->param ( seperate_rlist => Echolot::Config::get()->{'seperate_rlists'} );
$filename = $filebasename.'.html';
open(F, '>'.$filename) or
@@ -320,6 +321,7 @@ sub build_rlist1($$;$) {
#$output .= sprintf "Broken type-I remailer chains:\n\n";
#$output .= sprintf "Broken type-II remailer chains:\n\n";
+ $output .= sprintf "\n";
$output .= sprintf "Last update: %s\n", makeDate();
$output .= sprintf "remailer email address history latency uptime\n";
$output .= sprintf "-----------------------------------------------------------------------\n";
@@ -424,6 +426,29 @@ sub build_lists() {
@$rems = grep { $_->{'showit'} } @$rems;
build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist', Echolot::Config::get()->{'templates'}->{'rlist'});
build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2', Echolot::Config::get()->{'templates'}->{'rlist2'});
+
+ if (Echolot::Config::get()->{'seperate_rlists'}) {
+ $rems = build_rems(['cpunk-rsa']);
+ build_rlist1( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist-rsa', Echolot::Config::get()->{'templates'}->{'rlist-rsa'});
+ build_list2( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist2-rsa', Echolot::Config::get()->{'templates'}->{'rlist2-rsa'});
+ @$rems = grep { $_->{'showit'} } @$rems;
+ build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist-rsa', Echolot::Config::get()->{'templates'}->{'rlist-rsa'});
+ build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2-rsa', Echolot::Config::get()->{'templates'}->{'rlist2-rsa'});
+
+ $rems = build_rems(['cpunk-dsa']);
+ build_rlist1( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist-dsa', Echolot::Config::get()->{'templates'}->{'rlist-dsa'});
+ build_list2( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist2-dsa', Echolot::Config::get()->{'templates'}->{'rlist2-dsa'});
+ @$rems = grep { $_->{'showit'} } @$rems;
+ build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist-dsa', Echolot::Config::get()->{'templates'}->{'rlist-dsa'});
+ build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2-dsa', Echolot::Config::get()->{'templates'}->{'rlist2-dsa'});
+
+ $rems = build_rems(['cpunk-clear']);
+ build_rlist1( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist-clear', Echolot::Config::get()->{'templates'}->{'rlist-clear'});
+ build_list2( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist2-clear', Echolot::Config::get()->{'templates'}->{'rlist2-clear'});
+ @$rems = grep { $_->{'showit'} } @$rems;
+ build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist-clear', Echolot::Config::get()->{'templates'}->{'rlist-clear'});
+ build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2-clear', Echolot::Config::get()->{'templates'}->{'rlist2-clear'});
+ }
};
diff --git a/NEWS b/NEWS
index fdb0240..6bacbef 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Changes in
Use the change-thesaurus-filenames script in the tools
directory to convert your current thesaurus if you wish
to keep the data.
+ * Seperate rlists for rsa, dsa and plaintext pings are
+ supported now. Enable seperate_rlists in pingd.conf.
Changes in version 2.0 beta4 - 2002-07-10
* Minor documentation fixes
diff --git a/pingd b/pingd
index 8586ec5..2d83569 100755
--- a/pingd
+++ b/pingd
@@ -1,7 +1,9 @@
#!/usr/bin/perl -wT
+$| = 1;
+
# (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: pingd,v 1.27 2002/07/10 13:21:40 weasel Exp $
+# $Id: pingd,v 1.28 2002/07/10 17:16:45 weasel Exp $
#
=pod
diff --git a/pingd.conf b/pingd.conf
index 7bef62f..31fc381 100644
--- a/pingd.conf
+++ b/pingd.conf
@@ -1,14 +1,16 @@
# vim:set syntax=perl:
$CONFIG = {
- 'homedir' => '/home/pinger/echolot',
- 'sitename' => 'unconfigured',
+ 'homedir' => '/home/pinger/echolot',
+ 'sitename' => 'unconfigured',
- 'my_localpart' => 'pinger',
- 'my_domain' => 'example.com',
+ 'my_localpart' => 'pinger',
+ 'my_domain' => 'example.com',
- 'Pinger::Mix' => {
- 'mix' => '/home/pinger/Mix/mix',
- 'mixdir' => '/home/pinger/Mix'
- }
+ 'Pinger::Mix' => {
+ 'mix' => '/home/pinger/Mix/mix',
+ 'mixdir' => '/home/pinger/Mix'
+ },
+
+ 'seperate_rlists' => 0,
};
diff --git a/templates/mlist.html b/templates/mlist.html
index fd4c90d..81e7ee3 100644
--- a/templates/mlist.html
+++ b/templates/mlist.html
@@ -12,8 +12,35 @@ This is an automatically generated list of remailer reliability
statistics.
<p>
-<a HREF="mlist2.html">v2</a> and cpunk <a HREF="rlist.html">v1</a> and
-<a HREF="rlist2.html">v2</a> stats are also available.
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><strong>v1</strong></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
<p>
<a HREF="./">Up</a>
diff --git a/templates/mlist2.html b/templates/mlist2.html
index 4362096..c0345c9 100644
--- a/templates/mlist2.html
+++ b/templates/mlist2.html
@@ -12,8 +12,35 @@ This is an automatically generated list of remailer reliability
statistics.
<p>
-<a HREF="mlist.html">v1</a> and cpunk <a HREF="rlist.html">v1</a> and
-<a HREF="rlist2.html">v2</a> stats are also available.
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><strong>v2</strong></td>
+</tr>
+</table>
<p>
<a HREF="./">Up</a>
diff --git a/templates/rlist-clear.html b/templates/rlist-clear.html
new file mode 100644
index 0000000..f0a98a1
--- /dev/null
+++ b/templates/rlist-clear.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+ <title>Thesaurus [<TMPL_VAR NAME="SITE_NAME">]</title>
+</head>
+<body>
+<h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
+
+<h2>Cypherpunk Remailers (cleartext only)</h2>
+
+<p>
+This is an automatically generated list of remailer reliability
+statistics.
+
+<p>
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><strong>(cleartext)</strong></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
+
+<p>
+<a HREF="./">Up</a>
+
+<p>
+<pre>
+<TMPL_VAR NAME="list">
+</pre>
+
+<hr>
+Created by <a href="http://savannah.gnu.org/projects/echolot/">Echolot</a>.<br>
+Last update: <TMPL_VAR NAME="CURRENT_TIMESTAMP">.
+</body>
+
+<!-- vim:set ts=2: -->
+<!-- vim:set shiftwidth=2: -->
+</html>
diff --git a/templates/rlist-dsa.html b/templates/rlist-dsa.html
new file mode 100644
index 0000000..e2f3a7c
--- /dev/null
+++ b/templates/rlist-dsa.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+ <title>Thesaurus [<TMPL_VAR NAME="SITE_NAME">]</title>
+</head>
+<body>
+<h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
+
+<h2>Cypherpunk Remailers (DSA only)</h2>
+
+<p>
+This is an automatically generated list of remailer reliability
+statistics.
+
+<p>
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><strong>(dsa)</strong></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
+
+<p>
+<a HREF="./">Up</a>
+
+<p>
+<pre>
+<TMPL_VAR NAME="list">
+</pre>
+
+<hr>
+Created by <a href="http://savannah.gnu.org/projects/echolot/">Echolot</a>.<br>
+Last update: <TMPL_VAR NAME="CURRENT_TIMESTAMP">.
+</body>
+
+<!-- vim:set ts=2: -->
+<!-- vim:set shiftwidth=2: -->
+</html>
diff --git a/templates/rlist-rsa.html b/templates/rlist-rsa.html
new file mode 100644
index 0000000..6bceedb
--- /dev/null
+++ b/templates/rlist-rsa.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+ <title>Thesaurus [<TMPL_VAR NAME="SITE_NAME">]</title>
+</head>
+<body>
+<h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
+
+<h2>Cypherpunk Remailers (RSA only)</h2>
+
+<p>
+This is an automatically generated list of remailer reliability
+statistics.
+
+<p>
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><strong>(rsa)</strong></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
+
+<p>
+<a HREF="./">Up</a>
+
+<p>
+<pre>
+<TMPL_VAR NAME="list">
+</pre>
+
+<hr>
+Created by <a href="http://savannah.gnu.org/projects/echolot/">Echolot</a>.<br>
+Last update: <TMPL_VAR NAME="CURRENT_TIMESTAMP">.
+</body>
+
+<!-- vim:set ts=2: -->
+<!-- vim:set shiftwidth=2: -->
+</html>
diff --git a/templates/rlist.html b/templates/rlist.html
index 1a609cb..7987736 100644
--- a/templates/rlist.html
+++ b/templates/rlist.html
@@ -12,8 +12,35 @@ This is an automatically generated list of remailer reliability
statistics.
<p>
-<a HREF="rlist2.html">v2</a> and mixmaster <a HREF="mlist.html">v1</a> and
-<a HREF="mlist2.html">v2</a> stats are also available.
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><strong>v1</strong></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
<p>
<a HREF="./">Up</a>
diff --git a/templates/rlist2-clear.html b/templates/rlist2-clear.html
new file mode 100644
index 0000000..11dd3ff
--- /dev/null
+++ b/templates/rlist2-clear.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+ <title>Thesaurus [<TMPL_VAR NAME="SITE_NAME">]</title>
+</head>
+<body>
+<h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
+
+<h2>Cypherpunk Remailers (v2, cleartext only)</h2>
+
+<p>
+This is an automatically generated list of remailer reliability
+statistics.
+
+<p>
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><strong>(cleartext)</strong></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
+
+<p>
+<a HREF="./">Up</a>
+
+<p>
+<pre>
+<TMPL_VAR NAME="list">
+</pre>
+
+<hr>
+Created by <a href="http://savannah.gnu.org/projects/echolot/">Echolot</a>.<br>
+Last update: <TMPL_VAR NAME="CURRENT_TIMESTAMP">.
+</body>
+
+<!-- vim:set ts=2: -->
+<!-- vim:set shiftwidth=2: -->
+</html>
diff --git a/templates/rlist2-dsa.html b/templates/rlist2-dsa.html
new file mode 100644
index 0000000..7b60c44
--- /dev/null
+++ b/templates/rlist2-dsa.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+ <title>Thesaurus [<TMPL_VAR NAME="SITE_NAME">]</title>
+</head>
+<body>
+<h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
+
+<h2>Cypherpunk Remailers (v2, DSA only)</h2>
+
+<p>
+This is an automatically generated list of remailer reliability
+statistics.
+
+<p>
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><strong>(dsa)</strong></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
+
+<p>
+<a HREF="./">Up</a>
+
+<p>
+<pre>
+<TMPL_VAR NAME="list">
+</pre>
+
+<hr>
+Created by <a href="http://savannah.gnu.org/projects/echolot/">Echolot</a>.<br>
+Last update: <TMPL_VAR NAME="CURRENT_TIMESTAMP">.
+</body>
+
+<!-- vim:set ts=2: -->
+<!-- vim:set shiftwidth=2: -->
+</html>
diff --git a/templates/rlist2-rsa.html b/templates/rlist2-rsa.html
new file mode 100644
index 0000000..cdb4650
--- /dev/null
+++ b/templates/rlist2-rsa.html
@@ -0,0 +1,60 @@
+<html>
+<head>
+ <title>Thesaurus [<TMPL_VAR NAME="SITE_NAME">]</title>
+</head>
+<body>
+<h1>Remailer Reliability Stats [<TMPL_VAR NAME="SITE_NAME">]</h1>
+
+<h2>Cypherpunk Remailers (v2, RSA only)</h2>
+
+<p>
+This is an automatically generated list of remailer reliability
+statistics.
+
+<p>
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><a href="rlist2.html">v2</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><strong>(rsa)</strong></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
+
+<p>
+<a HREF="./">Up</a>
+
+<p>
+<pre>
+<TMPL_VAR NAME="list">
+</pre>
+
+<hr>
+Created by <a href="http://savannah.gnu.org/projects/echolot/">Echolot</a>.<br>
+Last update: <TMPL_VAR NAME="CURRENT_TIMESTAMP">.
+</body>
+
+<!-- vim:set ts=2: -->
+<!-- vim:set shiftwidth=2: -->
+</html>
diff --git a/templates/rlist2.html b/templates/rlist2.html
index 177b1e3..df1689f 100644
--- a/templates/rlist2.html
+++ b/templates/rlist2.html
@@ -12,8 +12,35 @@ This is an automatically generated list of remailer reliability
statistics.
<p>
-<a HREF="rlist.html">v1</a> and mixmaster <a HREF="mlist.html">v1</a> and
-<a HREF="mlist2.html">v2</a> stats are also available.
+Available Stats:
+<table border=1>
+<tr>
+<TMPL_IF NAME="seperate_rlist">
+ <th colspan=4>Cypherpunk (Type I)</th>
+<TMPL_ELSE>
+ <th>Cypherpunk (Type I)</th>
+</TMPL_IF>
+ <th>Mixmaster (Type II)</th>
+</tr>
+<tr>
+ <td><a href="rlist.html">v1</a></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist-rsa.html">(rsa)</a></td>
+ <td><a href="rlist-dsa.html">(dsa)</a></td>
+ <td><a href="rlist-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist.html">v1</a></td>
+</tr>
+<tr>
+ <td><strong>v2</strong></td>
+<TMPL_IF NAME="seperate_rlist">
+ <td><a href="rlist2-rsa.html">(rsa)</a></td>
+ <td><a href="rlist2-dsa.html">(dsa)</a></td>
+ <td><a href="rlist2-clear.html">(cleartext)</a></td>
+</TMPL_IF>
+ <td><a href="mlist2.html">v2</a></td>
+</tr>
+</table>
<p>
<a HREF="./">Up</a>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 12:50:15 +0000