diff options
| author | Alvaro Herrera | 2011-12-30 23:47:11 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2011-12-30 23:47:11 +0000 |
| commit | 427ca15789a5c27fc7ca2317ca9fb1d93c4bd5c3 (patch) | |
| tree | e7e8180f82c904ed826b422b28bcecf5362d32a1 | |
| parent | 38346cab3eefce2bcbfbc51fba777461a2594740 (diff) | |
Fixes for new pgweb database
| -rwxr-xr-x | archives/bin/generate-list-descriptions | 16 | ||||
| -rw-r--r-- | archives/etc/archives.conf | 7 | ||||
| -rw-r--r-- | archives/templates/html/bottom_config.html | 5 |
3 files changed, 16 insertions, 12 deletions
diff --git a/archives/bin/generate-list-descriptions b/archives/bin/generate-list-descriptions index 843cd9c5..8c1b422c 100755 --- a/archives/bin/generate-list-descriptions +++ b/archives/bin/generate-list-descriptions @@ -23,14 +23,14 @@ $group = "$ENV{'ARCHIVES_TEMPLATES'}/groups.json"; $list = "$ENV{'ARCHIVES_TEMPLATES'}/lists.json"; my ($conninfo, $conn); -$conninfo = sprintf("db=%s;host=%s", $ENV{'DBNAME'}, $ENV{'DBHOST'}); +$conninfo = sprintf("db=%s;host=%s;sslmode=require", $ENV{'DBNAME'}, $ENV{'DBHOST'}); $conn = DBI->connect("dbi:Pg:$conninfo", $ENV{'DBUSER'}, '', {AutoCommit => 0}) or die "cannot connect"; my (%groups, %lists); -my $query = "SELECT lg.id AS groupid, lg.name AS groupname, sortkey - FROM listgroups lg"; +my $query = "SELECT lg.id AS groupid, lg.groupname AS groupname, sortkey + FROM lists_mailinglistgroup lg"; my $sth = $conn->prepare($query); $sth->execute; while (my $h = $sth->fetchrow_hashref) { @@ -40,15 +40,15 @@ while (my $h = $sth->fetchrow_hashref) { }; } -$query = "SELECT lg.id AS groupid, lg.sortkey, l.name, l.shortdesc, +$query = "SELECT lg.id AS groupid, lg.sortkey, l.listname, l.shortdesc, l.description - FROM listgroups lg JOIN lists l ON (lg.id = l.grp) - ORDER BY sortkey, l.name"; + FROM lists_mailinglistgroup lg JOIN lists_mailinglist l ON (lg.id = l.group_id) + ORDER BY sortkey, l.listname"; $sth = $conn->prepare($query); $sth->execute; while (my $h = $sth->fetchrow_hashref) { - push @{$groups{$h->{'sortkey'}}->{'lists'}}, $h->{'name'}; - $lists{$h->{'name'}} = { + push @{$groups{$h->{'sortkey'}}->{'lists'}}, $h->{'listname'}; + $lists{$h->{'listname'}} = { description => $h->{'description'}, shortdesc => $h->{'shortdesc'}, group => $h->{'groupid'} diff --git a/archives/etc/archives.conf b/archives/etc/archives.conf index 4c6e1ae3..ff1de9ea 100644 --- a/archives/etc/archives.conf +++ b/archives/etc/archives.conf @@ -4,8 +4,8 @@ MHONARC=/usr/bin/mhonarc PSQL=/usr/local/pgsql/bin/psql # Database settings -DBHOST=wwwmaster.postgresql.org -DBNAME=186_www +DBHOST=wrigleys.postgresql.org +DBNAME=pgweb DBUSER=archives # paths to common stuff. If you need a testing area, change $ARCHIVES_ROOT @@ -34,3 +34,6 @@ SOURCE_ADDRESS=archives@archives.postgresql.org # avoid processing them all over again if a forced run is interrupted for some # reason. FORCE_FILE=$ARCHIVES_HOME/forced_run + +# The destination directory for "splitmbox". +SPLITMBOX_DEST=$ARCHIVES_HOME/messages diff --git a/archives/templates/html/bottom_config.html b/archives/templates/html/bottom_config.html index b779e5c4..64d0de11 100644 --- a/archives/templates/html/bottom_config.html +++ b/archives/templates/html/bottom_config.html @@ -5,8 +5,9 @@ </div> <div id="pgFooter"> - <a href="http://www.postgresql.org/about/privacypolicy" class="navFooter">Privacy Policy</a> | PostgreSQL Archives hosted by <a href="http://www.commandprompt.com/">Command Prompt, Inc.</a> | Designed by <a href="http://www.tinysofa.com/">tinysofa</a><br /> - Copyright © 1996 – 2008 PostgreSQL Global Development Group + <a class="navFooter" href="http://www.postgresql.org/about/privacypolicy">Privacy Policy</a> | + <a class="navFooter" href="http://www.postgresql.org/about/">About PostgreSQL</a><br/> + Copyright © 1996 – 2011 PostgreSQL Global Development Group </div> </div> </div> |