[Koha-cvs] CVS: koha/misc Install.pm,1.69.2.7,1.69.2.8

[MJ Ray]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29613

Modified Files:
      Tag: rel_2_0
        Install.pm 
Log Message:
Better explanation of httpd.conf (Bug 701)

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.69.2.7
retrieving revision 1.69.2.8
diff -C2 -r1.69.2.7 -r1.69.2.8
*** Install.pm  22 Apr 2004 11:41:25 -0000      1.69.2.7
--- Install.pm  22 Apr 2004 11:51:15 -0000      1.69.2.8
***************
*** 1272,1276 ****
  include %s/koha-httpd.conf
  and to make sure it is listening on the right ports
! (using the Listen directive).
  
  Press <ENTER> to continue: |;
--- 1272,1276 ----
  include %s/koha-httpd.conf
  and to make sure it is listening on the right ports
! (using the Listen directive) and host names.
  
  Press <ENTER> to continue: |;
***************
*** 1413,1416 ****
--- 1413,1424 ----
        print SITE <<EOP
  
+ # Koha 2.0 Apache Virtual Host Config File
+ #
+ # Please include this file in your apache configuration.
+ # The best way to do that depends on your site setup.
+ # Some like an Include adding to /etc/apache/httpd.conf
+ # and some prefer a symlink to this file from some dir.
+ # Please refer to your system manuals.
+ 
  # Ports to listen to for Koha
  # uncomment these if they aren't already in main httpd.conf
***************
*** 1419,1424 ****
  
  # NameVirtualHost is used by one of the optional configurations detailed below
  
! #NameVirtualHost 11.22.33.44
  
  # KOHA's OPAC Configuration
--- 1427,1434 ----
  
  # NameVirtualHost is used by one of the optional configurations detailed below
+ # Please make sure this line is correct before uncommenting.
+ # See http://httpd.apache.org/docs/vhosts/ for some guides.
  
! #NameVirtualHost *
  
  # KOHA's OPAC Configuration
***************
*** 1448,1462 ****
  </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\:$intranetport 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
  
--- 1458,1461 ----