[Dehs-devel] r139 - in trunk: . www
atomo64-guest at alioth.debian.org
atomo64-guest at alioth.debian.org
Sun Jun 1 23:35:59 UTC 2008
Author: atomo64-guest
Date: 2008-06-01 23:35:59 +0000 (Sun, 01 Jun 2008)
New Revision: 139
Modified:
trunk/dehs.config.inc
trunk/update_wwwal.sh
trunk/www/config_www.inc
Log:
Change to user/pwd-based AUTH as to prevent the ident auth failures
Modified: trunk/dehs.config.inc
===================================================================
--- trunk/dehs.config.inc 2008-06-01 23:13:30 UTC (rev 138)
+++ trunk/dehs.config.inc 2008-06-01 23:35:59 UTC (rev 139)
@@ -1,7 +1,11 @@
<?php
-$dbconn = 'dbname=dehs host=localhost';
+$password = file('/srv/alioth.debian.org/chroot/home/groups/dehs/.pgpass');
+$dbconn = 'dbname=dehs host=localhost user=dehs password=' . $password;
+
+unset($password);
+
$base = '/org/home/groups/dehs/dehs_prj/dehs/';
$dirs = array('diffs_dir' => $base . 'files/diffs',
Modified: trunk/update_wwwal.sh
===================================================================
--- trunk/update_wwwal.sh 2008-06-01 23:13:30 UTC (rev 138)
+++ trunk/update_wwwal.sh 2008-06-01 23:35:59 UTC (rev 139)
@@ -6,60 +6,72 @@
exit 1
fi
+cd /org/alioth.debian.org/chroot/home/groups/dehs/
+
+PGPASSFILE="$(mktemp -p .)"
+trap '[ ! -f "$PGPASSFILE" ] || rm -f "$PGPASSFILE"' EXIT
+cp ./.pgpass "$PGPASSFILE"
+export PGPASSFILE
+cd ./htdocs/
+
+export PGUSER=dehs
+export PGHOST=localhost
+export PGDATABASE=dehs
+
if [ "$STATS_ONLY" != "1" ]; then
- php4 -q $WORKDIR/www/no_watch.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_watch.html
- php4 -q $WORKDIR/www/no_upstream.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_upstream.html
- php4 -q $WORKDIR/www/no_updated.php > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_updated.html
- psql -h localhost -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' ORDER BY name ASC;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_watch.txt
- psql -h localhost -A -q -d dehs -c "SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' order by name asc;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_upstream.txt
- psql -h localhost -A -q -d dehs -c "SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable' AND updated='0' order by name asc;" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/no_updated.txt
- psql -h localhost -A -q -d dehs -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' UNION SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' UNION SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable';" | egrep -v '\?column\?|rows\)' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/dehs_debianqa.txt
- psql -h localhost -A -q -d dehs -c "SELECT name,version,up_version,lastupvsdebsync FROM pkgs WHERE up_version!='' AND up_version IS NOT NULL AND watch!='' AND watch IS NOT NULL AND updated='0' AND dist='unstable'" | egrep -v '\?column\?|rows\)' | grep -v 'name|version|up_version|lastupvsdebsync' > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/ddpomail.txt
+ php4 -q $WORKDIR/www/no_watch.php > ./no_watch.html
+ php4 -q $WORKDIR/www/no_upstream.php > ./no_upstream.html
+ php4 -q $WORKDIR/www/no_updated.php > ./no_updated.html
+ psql -A -q -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' ORDER BY name ASC;" | egrep -v '\?column\?|rows\)' > ./no_watch.txt
+ psql -A -q -c "SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' order by name asc;" | egrep -v '\?column\?|rows\)' > ./no_upstream.txt
+ psql -A -q -c "SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable' AND updated='0' order by name asc;" | egrep -v '\?column\?|rows\)' > ./no_updated.txt
+ psql -A -q -c "SELECT name || ': N/A' FROM pkgs WHERE watch IS NULL OR watch='' AND dist='unstable' UNION SELECT name || ': Error' FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable' UNION SELECT name || ': ' || up_version FROM pkgs WHERE up_version!='' AND watch!='' AND dist='unstable';" | egrep -v '\?column\?|rows\)' > ./dehs_debianqa.txt
+ psql -A -q -c "SELECT name,version,up_version,lastupvsdebsync FROM pkgs WHERE up_version!='' AND up_version IS NOT NULL AND watch!='' AND watch IS NOT NULL AND updated='0' AND dist='unstable'" | egrep -v '\?column\?|rows\)' | grep -v 'name|version|up_version|lastupvsdebsync' > ./ddpomail.txt
fi
-STATS=/org/alioth.debian.org/chroot/home/groups/dehs/htdocs/stats.txt
+STATS=./stats.txt
cat /dev/null > $STATS.new
echo -n 'watch_count:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE watch!='';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_count_unstable:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_count_experimental:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'no_watch_count:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE watch IS NULL OR watch='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE watch IS NULL OR watch='';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'no_watch_count_unstable:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'no_watch_count_experimental:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE (watch IS NULL OR watch='') AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_failed:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_failed_unstable:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'watch_failed_experimental:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE up_version='' AND watch!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'wwiz_count:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'wwiz_count_unstable:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'wwiz_count_experimental:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE wwiz_type='watch' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_count:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_count_unstable:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_count_experimental:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_real_count:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_real_count_unstable:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='unstable';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_real_count_experimental:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND up_version!='' AND dist='experimental';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_wwiz_count:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_wwiz_count_unstable:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='unstable' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
echo -n 'updated_wwiz_count_experimental:' >> $STATS.new
-psql -h localhost -A -q -d dehs -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
+psql -A -q -c "SELECT COUNT(id) FROM pkgs WHERE updated='1' AND dist='experimental' AND wwiz_type='watch';" | egrep -v '[^0-9]' >> $STATS.new
mv $STATS.new $STATS
-php4 -q $WORKDIR/www/stats.html > /org/alioth.debian.org/chroot/home/groups/dehs/htdocs/stats.html "$STATS"
+php4 -q $WORKDIR/www/stats.html > ./stats.html "$STATS"
Modified: trunk/www/config_www.inc
===================================================================
--- trunk/www/config_www.inc 2008-06-01 23:13:30 UTC (rev 138)
+++ trunk/www/config_www.inc 2008-06-01 23:35:59 UTC (rev 139)
@@ -1,8 +1,12 @@
<?php
-$db = @pg_connect("dbname=dehs host=localhost");
+
+$password = file('/srv/alioth.debian.org/chroot/home/groups/dehs/.pgpass');
+
+$db = @pg_connect("dbname=dehs host=localhost user=dehs password=$password");
if (!$db) {
- $db = @pg_pconnect("dbname=dehs host=localhost");
+ $db = @pg_pconnect("dbname=dehs host=localhost user=dehs password=$password");
}
+unset($password);
if (!$db) {
echo "Db error";
die(1);
More information about the Dehs-devel
mailing list