[Koha-cvs] CVS: koha/acqui.simple processz3950queue,1.3.2.4,1.3.2.5

[Steve Tonnesen]

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv26924

Modified Files:
      Tag: rel-1-2
	processz3950queue 
Log Message:
Removing hard coded values for apache user and pid-file directory (note that
these hard coded values were never actually used unless processz3950queue was
run as root in any case).


Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/processz3950queue,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** processz3950queue	30 Jun 2002 20:53:41 -0000	1.3.2.4
--- processz3950queue	3 Sep 2002 21:15:35 -0000	1.3.2.5
***************
*** 9,15 ****
  
  
  if ($< == 0) {
      # Running as root, switch privs 
!     if (-d "/var/run") {
  	open PID, ">/var/run/processz3950queue.pid";
  	print PID $$."\n";
--- 9,18 ----
  
  
+ my $configfile=configfile();
+ 
  if ($< == 0) {
      # Running as root, switch privs 
!     my $kohalogdir=$configfile->{'kohalogdir'};
!     if (-d $kohalogdir) {
  	open PID, ">/var/run/processz3950queue.pid";
  	print PID $$."\n";
***************
*** 17,21 ****
      }
      # Get real apacheuser from koha.conf or reparsing httpd.conf
!     my $apacheuser='www-data';  
      my $uid=0;
      unless ($uid = (getpwnam($apacheuser))[2]) { 
--- 20,25 ----
      }
      # Get real apacheuser from koha.conf or reparsing httpd.conf
!     my $apacheuser=$configfile->{'httpduser'};
!     ($apacheuser) || ($apacheuser='www-data'); 
      my $uid=0;
      unless ($uid = (getpwnam($apacheuser))[2]) { 
***************
*** 25,29 ****
      $<=$uid;
  }
-     
  
  my $dbh=C4Connect;
--- 29,32 ----
***************
*** 36,40 ****
  
  
! my $logdir=$ARGV[0];
  
  open PID, ">$logdir/processz3950queue.pid";
--- 39,43 ----
  
  
! my $logdir=$configfile->{'kohalogdir'};
  
  open PID, ">$logdir/processz3950queue.pid";