[Koha-cvs] CVS: koha installer.pl,1.2.2.24,1.2.2.25

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        installer.pl 
Log Message:
Check that OPAC and INTRANET directories are different.
Removed "common" from TransferLog directive
Tries to get an absolute apache log directory pathname from an ErrorLog
directive in httpd.conf


Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.24
retrieving revision 1.2.2.25
diff -C2 -r1.2.2.24 -r1.2.2.25
*** installer.pl        24 Jun 2002 18:04:26 -0000      1.2.2.24
--- installer.pl        24 Jun 2002 19:42:55 -0000      1.2.2.25
***************
*** 84,90 ****
  my $domainname = `hostname -d`;
  chomp $domainname;
! my $opacdir = '/usr/local/www/opac';
! my $kohadir = '/usr/local/www/koha';
! print qq|
  
  OPAC DIRECTORY
--- 84,93 ----
  my $domainname = `hostname -d`;
  chomp $domainname;
! my $opacdir = '/usr/local/koha/opac';
! my $kohadir = '/usr/local/koha/intranet';
! my $getdirinfo=1;
! while ($getdirinfo) {
!     # Loop until opac directory and koha directory are different
!     print qq|
  
  OPAC DIRECTORY
***************
*** 97,109 ****
  |;
  
! print "Enter directory [$opacdir]: ";
! chomp($input = <STDIN>);
  
! if ($input) {
!   $opacdir = $input;
! }
  
  
! print qq|
  
  INTRANET/LIBRARIANS DIRECTORY
--- 100,112 ----
  |;
  
!     print "Enter directory [$opacdir]: ";
!     chomp($input = <STDIN>);
  
!     if ($input) {
!       $opacdir = $input;
!     }
  
  
!     print qq|
  
  INTRANET/LIBRARIANS DIRECTORY
***************
*** 113,124 ****
  it doesn't exist.
  
- Usually $kohadir
  |;
  
! print "Enter directory [$kohadir]: ";
! chomp($input = <STDIN>);
  
! if ($input) {
!   $kohadir = $input;
  }
  
--- 116,136 ----
  it doesn't exist.
  
  |;
  
!     print "Enter directory [$kohadir]: ";
!     chomp($input = <STDIN>);
  
!     if ($input) {
!       $kohadir = $input;
!     }
!     if ($kohadir eq $opacdir) {
!       print qq|
! 
! You must specify different directories for the OPAC and INTRANET files!
! 
! |;
!     } else {
!       $getdirinfo=0;
!     }
  }
  
***************
*** 311,314 ****
--- 323,339 ----
  # Update Apache Conf File.
  #
+ #
+ 
+ my $logfiledir=`grep ^ErrorLog $realhttpdconf`;
+ chomp $logfiledir;
+ 
+ if ($logfiledir) {
+     $logfiledir=~m#ErrorLog (.*)/[^/]*$#;
+     $logfiledir=$1;
+ }
+ 
+ unless ($logfiledir) {
+     $logfiledir='logs';
+ }
  print qq|
  
***************
*** 331,336 ****
     ServerName $opac_svr_name
     ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
!    ErrorLog logs/opac-error_log
!    TransferLog logs/opac-access_log common
     SetEnv PERL5LIB "$kohadir/modules"
  </VirtualHost>
--- 356,361 ----
     ServerName $opac_svr_name
     ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
!    ErrorLog $logfiledir/opac-error_log
!    TransferLog $logfiledir/opac-access_log
     SetEnv PERL5LIB "$kohadir/modules"
  </VirtualHost>
***************
*** 341,346 ****
     ServerName $koha_svr_name
     ScriptAlias /cgi-bin/koha/ "$kohadir/cgi-bin/"
!    ErrorLog logs/koha-error_log
!    TransferLog logs/koha-access_log common
     SetEnv PERL5LIB "$kohadir/modules"
  </VirtualHost>
--- 366,371 ----
     ServerName $koha_svr_name
     ScriptAlias /cgi-bin/koha/ "$kohadir/cgi-bin/"
!    ErrorLog $logfiledir/koha-error_log
!    TransferLog $logfiledir/koha-access_log
     SetEnv PERL5LIB "$kohadir/modules"
  </VirtualHost>
***************
*** 350,354 ****
      close(SITE);
      print "Successfully updated Apache Configuration file.\n";
- 
  }
  
--- 375,378 ----
***************
*** 482,486 ****
      system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass $dbname < 
koha.mysql");
      system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass mysql -e \"insert 
into user (Host,User,Password) values 
('$hostname','$user',password('$pass'))\"\;");
!     system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass mysql -e \"insert 
into db 
(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv)
 values ('%','$dbname','$user','Y','Y','Y','Y','Y','Y');");
      system("$mysqldir/bin/mysqladmin -u$mysqluser -p$mysqlpass reload");
  
--- 506,510 ----
      system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass $dbname < 
koha.mysql");
      system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass mysql -e \"insert 
into user (Host,User,Password) values 
('$hostname','$user',password('$pass'))\"\;");
!     system("$mysqldir/bin/mysql -u$mysqluser -p$mysqlpass mysql -e \"insert 
into db 
(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,
 index_priv, alter_priv) values 
('%','$dbname','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
      system("$mysqldir/bin/mysqladmin -u$mysqluser -p$mysqlpass reload");