doc/install/linux/install.pl - diff

Return to install.pl CVS log

Up to [LON-CAPA] / doc / install / linux

version 1.14, 2011/05/22 11:56:15	version 1.16, 2011/05/24 00:17:37
Line 660 sub chkapache {	Line 660 sub chkapache {
}	}
} elsif ($distro =~ /^fedora(\d+)$/) {	} elsif ($distro =~ /^fedora(\d+)$/) {
if ($1 > 10) {	if ($1 > 10) {
$conftype = 'new/httpd.conf';	$configfile = 'new/httpd.conf';
}	}
}	}
if (!-e "$instdir/centos-rhes-fedora-sl/$configfile") {	if (!-e "$instdir/centos-rhes-fedora-sl/$configfile") {
Line 699 sub chksrvcs {	Line 699 sub chksrvcs {
close(PIPE);	close(PIPE);
if ($daemonrunning) {	if ($daemonrunning) {
if ($service eq 'memcached') {	if ($service eq 'memcached') {
my $cmd = '/usr/sbin/memcached';	my $cmd = '/usr/bin/memcached';
if ($distro =~ /^centos\|fedora\|scientific\|rhes/) {	if ($distro =~ /^(suse\|sles)/) {
$cmd = '/usr/bin/memcached';	$cmd = '/usr/sbin/memcached';
}	}
unless ($daemonrunning =~ m{^www[^/]+\Q$cmd -m 400 -v\E$}) {	unless ($daemonrunning =~ m{^www[^/]+\Q$cmd -m 400 -v\E$}) {
$stopsrvcs{$service} = 1;	$stopsrvcs{$service} = 1;
}	}