[Koha-cvs] CVS: koha koha.upgrade,1.1.2.5,1.1.2.6 installer.pl,1.2.2.49,1.2.2.50

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv22946

Modified Files:
      Tag: rel-1-2
	koha.upgrade installer.pl 
Log Message:
store httpduser variable in /etc/koha.conf


Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** koha.upgrade	3 Jul 2002 17:00:53 -0000	1.1.2.5
--- koha.upgrade	3 Jul 2002 17:07:09 -0000	1.1.2.6
***************
*** 325,328 ****
--- 325,331 ----
  	$kccontents.="includes=$intranetdir/htdocs/includes\n";
  	$kc->{'includes'}=1;
+     } elsif (/^\s*httpduser\s*=/) {
+ 	$kccontents.="httpduser=$httpduser\n";
+ 	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
  	$kccontents.="kohaversion=$newversion\n";
***************
*** 344,347 ****
--- 347,353 ----
  unless (defined($kc->{'includes'})) {
      $kccontents.="includes=$intranetdir/htdocs/includes\n";
+ }
+ unless (defined($kc->{'httpduser'})) {
+     $kccontents.="httpduser=$httpduser\n";
  }
  unless (defined($kc->{'intranetdir'})) {

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.49
retrieving revision 1.2.2.50
diff -C2 -r1.2.2.49 -r1.2.2.50
*** installer.pl	3 Jul 2002 04:45:11 -0000	1.2.2.49
--- installer.pl	3 Jul 2002 17:07:09 -0000	1.2.2.50
***************
*** 280,283 ****
--- 280,284 ----
  opacdir=$opacdir
  kohaversion=$kohaversion
+ httpduser=$httpduser
  EOP
  ;