about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--examples/public-inbox-config2
-rw-r--r--lib/PublicInbox/Config.pm2
-rw-r--r--lib/PublicInbox/Feed.pm6
-rw-r--r--t/cgi.t4
-rw-r--r--t/config.t2
5 files changed, 9 insertions, 7 deletions
diff --git a/examples/public-inbox-config b/examples/public-inbox-config
index 6793f256..0c1db118 100644
--- a/examples/public-inbox-config
+++ b/examples/public-inbox-config
@@ -5,11 +5,9 @@
         address = sandbox@public-inbox.org
         address = test@public-inbox.org
         mainrepo = /home/pi/test-main.git
-        description = test/sandbox area, occasionally reset
         url = http://example.com/test
 [publicinbox "meta"]
         address = meta@public-inbox.org
         mainrepo = /home/pi/meta-main.git
-        description = development discussion
         url = http://example.com/meta
         atomUrl = http://example.com/meta
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index d71bc52e..32bd9ab6 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -57,7 +57,7 @@ sub lookup {
         defined $pfx or return;
 
         my %rv;
-        foreach my $k (qw(mainrepo description address)) {
+        foreach my $k (qw(mainrepo address)) {
                 my $v = $self->{"$pfx.$k"};
                 $rv{$k} = $v if defined $v;
         }
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 4671323c..8cc8b728 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -200,9 +200,13 @@ sub get_feedopts {
         my $listname = $args->{listname};
         my $cgi = $args->{cgi};
         my %rv;
+        if (open my $fh, '<', "$args->{git_dir}/description") {
+                chomp($rv{description} = <$fh>);
+                close $fh;
+        }
 
         if ($pi_config && defined $listname && length $listname) {
-                foreach my $key (qw(description address)) {
+                foreach my $key (qw(address)) {
                         $rv{$key} = $pi_config->get($listname, $key) || "";
                 }
         }
diff --git a/t/cgi.t b/t/cgi.t
index 365acd84..b59ca54a 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -28,10 +28,12 @@ my $cfgpfx = "publicinbox.test";
         is(1, mkdir($pi_home, 0755), "setup ~/.public-inbox");
         is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
 
+        open my $fh, '>', "$maindir/description" or die "open: $!\n";
+        print $fh "test for public-inbox\n";
+        close $fh or die "close: $!\n";
         my %cfg = (
                 "$cfgpfx.address" => $addr,
                 "$cfgpfx.mainrepo" => $maindir,
-                "$cfgpfx.description" => 'test for public-inbox',
         );
         while (my ($k,$v) = each %cfg) {
                 is(0, system(qw(git config --file), $pi_config, $k, $v),
diff --git a/t/config.t b/t/config.t
index 50bc8d6d..d4700fc9 100644
--- a/t/config.t
+++ b/t/config.t
@@ -29,7 +29,6 @@ my $tmpdir = tempdir(CLEANUP => 1);
                 'mainrepo' => '/home/pi/meta-main.git',
                 'address' => 'meta@public-inbox.org',
                 -primary_address => 'meta@public-inbox.org',
-                'description' => 'development discussion',
                 'listname' => 'meta',
         }, "lookup matches expected output");
 
@@ -43,7 +42,6 @@ my $tmpdir = tempdir(CLEANUP => 1);
                               'test@public-inbox.org'],
                 -primary_address => 'try@public-inbox.org',
                 'mainrepo' => '/home/pi/test-main.git',
-                'description' => 'test/sandbox area, occasionally reset',
                 'listname' => 'test',
         }, "lookup matches expected output for test");
 }