Index: branches/eam_branches/ipp-20130509/pstamp/scripts/pstamp_save_server_status.pl
===================================================================
--- branches/eam_branches/ipp-20130509/pstamp/scripts/pstamp_save_server_status.pl	(revision 35565)
+++ branches/eam_branches/ipp-20130509/pstamp/scripts/pstamp_save_server_status.pl	(revision 35594)
@@ -12,16 +12,11 @@
 use Pod::Usage qw( pod2usage );
 
-# XXX: We should get this from site.config, but that would about double
-# the execution time for this script.
-my $rundir = "/data/ippc17.0/pstamp";
-
-my $status_file = "$rundir/web/status.html";
-
 my $updatelink;
 my $verbose;
 my $save_temps;
+my $pstamp_workdir;
 
 GetOptions(
-    'rundir=s'      => \$rundir,
+    'workdir=s'      => \$pstamp_workdir,
     'update-link'    => \$updatelink,
     'verbose'       => \$verbose,
@@ -37,9 +32,20 @@
 }
 
+if (!$pstamp_workdir) {
+    my $ipprc = PS::IPP::Config->new(); # IPP Configuration
+    $pstamp_workdir = metadataLookupStr($ipprc->{_siteConfig}, 'PSTAMP_WORKDIR');
+}
+
+if (!$pstamp_workdir) {
+    warn("Failed to find PSTAMP_WORKDIR in the config\n");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
+my $status_file = "$pstamp_workdir/server_status/status.html";
+
 my ($sec, $min, $hour, $mday, $month, $year) = gmtime;
 $year += 1900;
 $month += 1;
 
-my $dir = sprintf "$rundir/work/server_status/%4d/%02d/%02d", $year, $month, $mday;
+my $dir = sprintf "$pstamp_workdir/server_status/%4d/%02d/%02d", $year, $month, $mday;
 
 if (!-e $dir ) {
Index: branches/eam_branches/ipp-20130509/pstamp/test/maketestreq
===================================================================
--- branches/eam_branches/ipp-20130509/pstamp/test/maketestreq	(revision 35565)
+++ branches/eam_branches/ipp-20130509/pstamp/test/maketestreq	(revision 35594)
@@ -30,9 +30,7 @@
 }
 
-# XXX: get these from site.config
-$pstamptool .= " -dbserver ippc19 -dbname ippRequestServer";
-
 
 my ($input, $submit, $listfile, $delete, $simple, $tag_req_name, $req_name, $email);
+my ($dbname, $dbserver);
 my ($save_temps, $verbose);
 
@@ -50,4 +48,7 @@
     'label=s'           => \$label,
     'email=s'           => \$email,
+
+    'dbname=s'           => \$dbname,
+    'dbserver=s'         => \$dbserver,
 
     'listfile|l'        => \$listfile,
@@ -68,4 +69,19 @@
 die ("Input file $input not found\n") unless (-e $input);
 die ("Input file $input not readable\n") unless (-r $input);
+
+if (!$dbname or !$dbserver) {
+    my $ipprc = PS::IPP::Config->new('GPC1');
+
+    if (!$dbserver) {
+        $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
+        die ("couldn't find dbserver in site.config\n") unless $dbserver;
+    }
+    if (!$dbname) {
+        $dbname =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBNAME');
+        die ("couldn't find dbname in site.config\n") unless $dbname;
+    }
+}
+$pstamptool .= " -dbserver $dbserver -dbname $dbname";
+
 
 # if request name was not supplied make one