version 1.13, 2011/05/16 14:00:09
|
version 1.14, 2011/05/22 11:56:15
|
Line 653 sub chkapache {
|
Line 653 sub chkapache {
|
} |
} |
} |
} |
} else { |
} else { |
if (!-e "$instdir/centos-rhes-fedora-sl/httpd.conf") { |
my $configfile = 'httpd.conf'; |
|
if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) { |
|
if ($1 > 5) { |
|
$configfile = 'new/httpd.conf'; |
|
} |
|
} elsif ($distro =~ /^fedora(\d+)$/) { |
|
if ($1 > 10) { |
|
$conftype = 'new/httpd.conf'; |
|
} |
|
} |
|
if (!-e "$instdir/centos-rhes-fedora-sl/$configfile") { |
$fixapache = 0; |
$fixapache = 0; |
print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n"; |
print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n"; |
} elsif ((-e "/etc/httpd/conf/httpd.conf") && (-e "$instdir/centos-rhes-fedora-sl/httpd.conf")) { |
} elsif ((-e "/etc/httpd/conf/httpd.conf") && (-e "$instdir/centos-rhes-fedora-sl/$configfile")) { |
if (open(PIPE, "diff --brief $instdir/centos-rhes-fedora-sl/httpd.conf /etc/httpd/conf/httpd.conf |")) { |
if (open(PIPE, "diff --brief $instdir/centos-rhes-fedora-sl/$configfile /etc/httpd/conf/httpd.conf |")) { |
my $diffres = <PIPE>; |
my $diffres = <PIPE>; |
close(PIPE); |
close(PIPE); |
chomp($diffres); |
chomp($diffres); |
Line 1255 if ($callsub{'apache'}) {
|
Line 1265 if ($callsub{'apache'}) {
|
} elsif ($distro =~ /^(debian|ubuntu)/) { |
} elsif ($distro =~ /^(debian|ubuntu)/) { |
©_apache2_debconf($instdir); |
©_apache2_debconf($instdir); |
} else { |
} else { |
©_httpd_conf($instdir); |
©_httpd_conf($instdir,$distro); |
} |
} |
} else { |
} else { |
print_and_log(&mt('Skipping configuration of Apache web server.')."\n"); |
print_and_log(&mt('Skipping configuration of Apache web server.')."\n"); |
Line 1689 sub get_mysql_version {
|
Line 1699 sub get_mysql_version {
|
########################################################### |
########################################################### |
|
|
sub copy_httpd_conf { |
sub copy_httpd_conf { |
my ($instdir) = @_; |
my ($instdir,$distro) = @_; |
|
my $configfile = 'httpd.conf'; |
|
if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) { |
|
if ($1 > 5) { |
|
$configfile = 'new/httpd.conf'; |
|
} |
|
} elsif ($distro =~ /^fedora(\d+)$/) { |
|
if ($1 > 10) { |
|
$configfile = 'new/httpd.conf'; |
|
} |
|
} |
print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'httpd.conf'", |
print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'httpd.conf'", |
"'/etc/httpd/conf/httpd.conf'")."\n"); |
"'/etc/httpd/conf/httpd.conf'")."\n"); |
copy "/etc/httpd/conf/httpd.conf","/etc/httpd/conf/httpd.conf.original"; |
copy "/etc/httpd/conf/httpd.conf","/etc/httpd/conf/httpd.conf.original"; |
copy "$instdir/centos-rhes-fedora-sl/httpd.conf","/etc/httpd/conf/httpd.conf"; |
copy "$instdir/centos-rhes-fedora-sl/$configfile","/etc/httpd/conf/httpd.conf"; |
chmod(0444,"/etc/httpd/conf/httpd.conf"); |
chmod(0444,"/etc/httpd/conf/httpd.conf"); |
print_and_log("\n"); |
print_and_log("\n"); |
} |
} |