[Koha-cvs] CVS: koha installer.pl,1.2.2.26,1.2.2.27

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
        installer.pl 
Log Message:
Changed the apache configuration to use ports based virtual hosting instead of
ip based virtual hosting.


Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.26
retrieving revision 1.2.2.27
diff -C2 -r1.2.2.26 -r1.2.2.27
*** installer.pl        25 Jun 2002 16:11:33 -0000      1.2.2.26
--- installer.pl        25 Jun 2002 18:16:40 -0000      1.2.2.27
***************
*** 273,278 ****
  #
  my $svr_admin = "address@hidden";
! my $opac_svr_name = "opac.$domainname";
! my $koha_svr_name = "koha.$domainname";
  
  print qq|
--- 273,280 ----
  #
  my $svr_admin = "address@hidden";
! my $servername=`hostname -f`;
! chomp $servername;
! $opacport=80;
! $kohaport=8080;
  
  print qq|
***************
*** 281,285 ****
  =====================================
  Koha needs to setup your Apache configuration file for the
! OPAC virtual host.
  
  Please enter the e-mail address for your webserver admin.
--- 283,291 ----
  =====================================
  Koha needs to setup your Apache configuration file for the
! OPAC and LIBRARIAN virtual hosts.  By default this installer
! will do this by using one ip address and two different ports
! for the virtual hosts.  There are other ways to set this up,
! and the installer will leave comments in httpd.conf detailing
! what these other options are.
  
  Please enter the e-mail address for your webserver admin.
***************
*** 297,320 ****
  print qq|
  
! Please enter the servername for your OPAC interface.
! Usually $opac_svr_name
  |;
! print "Enter servername address [$opac_svr_name]:";
  chomp($input = <STDIN>);
  
  if ($input) {
!   $opac_svr_name = $input;
  }
  
  print qq|
  
! Please enter the servername for your Intranet/Librarian interface.
! Usually $koha_svr_name
  |;
! print "Enter servername address [$koha_svr_name]:";
  chomp($input = <STDIN>);
  
  if ($input) {
!   $koha_svr_name = $input;
  }
  
--- 303,336 ----
  print qq|
  
! 
! Please enter the domain name or ip address of your computer.
! |;
! print "Enter server name/ip address [$servername]:";
! chomp($input = <STDIN>);
! 
! if ($input) {
!   $servername = $input;
! }
! 
! print qq|
! 
! Please enter the port for your OPAC interface.
  |;
! print "Enter OPAC port [$opacport]:";
  chomp($input = <STDIN>);
  
  if ($input) {
!   $opacport = $input;
  }
  
  print qq|
  
! Please enter the port for your Intranet/Librarian interface.
  |;
! print "Enter intranet port [$kohaport]:";
  chomp($input = <STDIN>);
  
  if ($input) {
!   $kohaport = $input;
  }
  
***************
*** 342,347 ****
  
  |;
! if (`grep 'VirtualHost $opac_svr_name' $realhttpdconf`) {
!     warn "$realhttpdconf appears to already have an entry for Koha\nVirtual 
Hosts.\n";
      print "Press <ENTER> to continue...";
      <STDIN>;
--- 358,370 ----
  
  |;
! if (`grep 'VirtualHost $servername' $realhttpdconf`) {
!     print qq|
! $realhttpdconf appears to already have an entry for Koha
! Virtual Hosts.  You may need to edit $realhttpdconf
! if anything has changed since it was last set up.  This
! script will not attempt to modify an existing Koha apache
! configuration.
! 
! |;
      print "Press <ENTER> to continue...";
      <STDIN>;
***************
*** 351,358 ****
      print SITE <<EOP
  
! <VirtualHost $opac_svr_name>
     ServerAdmin $svr_admin
     DocumentRoot $opacdir/htdocs
!    ServerName $opac_svr_name
     ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
     ErrorLog $logfiledir/opac-error_log
--- 374,391 ----
      print SITE <<EOP
  
! 
! # Ports to listen to for Koha
! Listen $opacport
! Listen $kohaport
! 
! # NameVirtualHost is used by one of the optional configurations detailed below
! 
! #NameVirtualHost 11.22.33.44
! 
! # KOHA's OPAC Configuration
! <VirtualHost $servername\:$opacport>
     ServerAdmin $svr_admin
     DocumentRoot $opacdir/htdocs
!    ServerName $servername
     ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
     ErrorLog $logfiledir/opac-error_log
***************
*** 361,368 ****
  </VirtualHost>
  
! <VirtualHost $koha_svr_name>
     ServerAdmin $svr_admin
     DocumentRoot $kohadir/htdocs
!    ServerName $koha_svr_name
     ScriptAlias /cgi-bin/koha/ "$kohadir/cgi-bin/"
     ErrorLog $logfiledir/koha-error_log
--- 394,402 ----
  </VirtualHost>
  
! # KOHA's INTRANET Configuration
! <VirtualHost $servername\:$kohaport>
     ServerAdmin $svr_admin
     DocumentRoot $kohadir/htdocs
!    ServerName $servername
     ScriptAlias /cgi-bin/koha/ "$kohadir/cgi-bin/"
     ErrorLog $logfiledir/koha-error_log
***************
*** 370,373 ****
--- 404,418 ----
     SetEnv PERL5LIB "$kohadir/modules"
  </VirtualHost>
+ 
+ # If you want to use name based Virtual Hosting:
+ #   1. remove the two Listen lines
+ #   2. replace $servername\:$opacport wih your.opac.domain.name
+ #   3. replace ServerName $servername wih ServerName your.opac.domain.name
+ #   4. replace $servername\:$kohaport wih your intranet domain name
+ #   5. replace ServerName $servername wih ServerName your.intranet.domain.name
+ #
+ # If you want to use NameVirtualHost'ing (using two names on one ip address):
+ #   1.  Follow steps 1-5 above
+ #   2.  Uncomment the NameVirtualHost line and set the correct ip address
  
  EOP