[Koha-cvs] CVS: koha/z3950 processz3950queue,1.7,1.8 z3950-daemon-launch.sh,1.2,1.3 z3950-daemon-shell.sh,1.2,1.3

[MJ Ray]

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1:/tmp/cvs-serv26381/z3950

Modified Files:
        processz3950queue z3950-daemon-launch.sh z3950-daemon-shell.sh 
Log Message:
Removing config info from z3950*sh and using C4::Context in processz3950queue 
(Fixed bug 39)

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** processz3950queue   1 Oct 2003 15:08:14 -0000       1.7
--- processz3950queue   6 Oct 2003 09:10:39 -0000       1.8
***************
*** 20,24 ****
      }
      # Get real apacheuser from koha.conf or reparsing httpd.conf
!     my $apacheuser='paul';
      my $uid=0;
      unless ($uid = (getpwnam($apacheuser))[2]) {
--- 20,24 ----
      }
      # Get real apacheuser from koha.conf or reparsing httpd.conf
!     my $apacheuser=C4::Context->config("httpduser");
      my $uid=0;
      unless ($uid = (getpwnam($apacheuser))[2]) {

Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-launch.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** z3950-daemon-launch.sh      29 Apr 2003 16:48:25 -0000      1.2
--- z3950-daemon-launch.sh      6 Oct 2003 09:10:39 -0000       1.3
***************
*** 15,22 ****
  
  #----------------------------
! # User ID to run the daemon as.  Don't use "root"
! RunAsUser=apache
! 
! KohaZ3950Dir=/home/paul/koha.dev/koha/z3950
  export KohaZ3950Dir
  
--- 15,19 ----
  
  #----------------------------
! . z3950-daemon-options
  export KohaZ3950Dir
  
***************
*** 42,45 ****
--- 39,45 ----
  #--------------
  # $Log$
+ # Revision 1.3  2003/10/06 09:10:39  slef
+ # Removing config info from z3950*sh and using C4::Context in 
processz3950queue (Fixed bug 39)
+ #
  # Revision 1.2  2003/04/29 16:48:25  tipaul
  # really proud of this commit :-)

Index: z3950-daemon-shell.sh
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-shell.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** z3950-daemon-shell.sh       29 Apr 2003 16:48:25 -0000      1.2
--- z3950-daemon-shell.sh       6 Oct 2003 09:10:39 -0000       1.3
***************
*** 13,20 ****
  
  #----------------------------
! 
! KohaZ3950Dir=/home/paul/koha.dev/koha/z3950
! KohaModuleDir=/home/paul/koha.dev/koha
! LogDir=/tmp
  
  #----------------------------
--- 13,17 ----
  
  #----------------------------
! . z3950-daemon-options
  
  #----------------------------
***************
*** 42,45 ****
--- 39,45 ----
  #-------------------
  # $Log$
+ # Revision 1.3  2003/10/06 09:10:39  slef
+ # Removing config info from z3950*sh and using C4::Context in 
processz3950queue (Fixed bug 39)
+ #
  # Revision 1.2  2003/04/29 16:48:25  tipaul
  # really proud of this commit :-)