[Koha-cvs] CVS: koha/misc Install.pm,1.37,1.38

[MJ Ray]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv4452

Modified Files:
        Install.pm 
Log Message:
Fixing httpd.conf to be koha-httpd.conf where necessary

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** Install.pm  20 May 2003 20:11:44 -0000      1.37
--- Install.pm  21 May 2003 21:47:05 -0000      1.38
***************
*** 1132,1136 ****
      chomp $logfiledir;
      
!     my $httpdconf = $etcdir."/httpd.conf";
  
      if ($logfiledir) {
--- 1132,1136 ----
      chomp $logfiledir;
      
!     my $httpdconf = $etcdir."/koha-httpd.conf";
  
      if ($logfiledir) {
***************
*** 1261,1264 ****
--- 1261,1265 ----
      my $message=getmessage('IntranetAuthenticationQuestion');
      my $answer=showmessage($message, 'yn', 'y');
+     my $httpdconf = $etcdir."/koha-httpd.conf";
  
      my $apacheauthusername='librarian';
***************
*** 1279,1283 ****
        print AUTH $apacheauthusername.":".crypt($apacheauthpassword, 
$salt)."\n";
        close AUTH;
!       open(SITE,">>$realhttpdconf") or warn "Insufficient priveleges to open 
$realhttpdconf for writing.\n";
        print SITE <<EOP
  
--- 1280,1284 ----
        print AUTH $apacheauthusername.":".crypt($apacheauthpassword, 
$salt)."\n";
        close AUTH;
!       open(SITE,">>$httpdconf") or warn "Insufficient priveleges to open 
$realhttpdconf for writing.\n";
        print SITE <<EOP