[Koha-cvs] CVS: koha/misc Install.pm,1.54,1.55
MJ Ray
slef at users.sourceforge.net
Mon Oct 20 21:16:52 CEST 2003
Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv7426/misc
Modified Files:
Install.pm
Log Message:
Work on install bugs (see bug 632)
Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** Install.pm 20 Oct 2003 14:25:36 -0000 1.54
--- Install.pm 20 Oct 2003 19:16:50 -0000 1.55
***************
*** 958,965 ****
$messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq|
! I was not able to determine the user that Apache is running as. This
! information is necessary in order to set the access privileges correctly on
%s/koha.conf. This user should be set in one of the Apache configuration
! files using the "User" directive.
Enter the Apache userid: |;
--- 958,966 ----
$messages->{'EnterApacheUser'}->{en} = heading('NEED APACHE USER') . qq|
! The installer could not find the user that Apache is running as.
! This is used to set up access permissions of
%s/koha.conf. This user should be set in one of the Apache configuration
! files with the "User" line.
! Please try to find it and enter the user name below.
Enter the Apache userid: |;
***************
*** 978,982 ****
/var/www/conf/httpd.conf
/etc/apache2/httpd.conf
! /etc/apache2/apache.conf
/etc/apache/conf/httpd.conf
/etc/apache/conf/apache.conf
--- 979,983 ----
/var/www/conf/httpd.conf
/etc/apache2/httpd.conf
! /etc/apache2/apache2.conf
/etc/apache/conf/httpd.conf
/etc/apache/conf/apache.conf
***************
*** 1068,1072 ****
NOTE: You will need to add lines to your main httpd.conf to
! Include %s/koha-httpd.conf
and to make sure it is listening on the right ports
(using the Listen directive).
--- 1069,1073 ----
NOTE: You will need to add lines to your main httpd.conf to
! include %s/koha-httpd.conf
and to make sure it is listening on the right ports
(using the Listen directive).
***************
*** 1192,1196 ****
startsysout;
! if (`grep -q 'VirtualHost $servername' "$httpdconf"`) {
showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter');
return;
--- 1193,1197 ----
startsysout;
! if (`grep -q 'VirtualHost $servername' "$httpdconf" 2>/dev/null`) {
showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter');
return;
***************
*** 1418,1422 ****
#MJR: generate our own settings, to remove the /home/paul hardwired links
open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options");
! print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\n";
close(FILE);
--- 1419,1423 ----
#MJR: generate our own settings, to remove the /home/paul hardwired links
open(FILE,">$intranetdir/scripts/z3950daemon/z3950-daemon-options");
! print FILE "RunAsUser=apache\nKohaZ3950Dir=$intranetdir/scripts/z3950daemon\nKohaModuleDir=$intranetdir/modules\nLogDir=$kohalogdir\nKohaConf=$etcdir/koha.conf";
close(FILE);
***************
*** 1772,1776 ****
my %configfile;
! open (KC, "</etc/koha.conf");
while (<KC>) {
chomp;
--- 1773,1778 ----
my %configfile;
! #MJR: reverted to r1.53. Please call setetcdir(). Do NOT hardcode this.
! open (KC, "<$etcdir/koha.conf");
while (<KC>) {
chomp;
More information about the Koha-cvs
mailing list