version 1.89, 2024/06/13 01:21:59
|
version 1.90, 2024/06/20 00:29:49
|
Line 623 sub check_mysql_running {
|
Line 623 sub check_mysql_running {
|
$proc_owner = 'mysql'; |
$proc_owner = 'mysql'; |
} |
} |
} elsif ($distro =~ /^debian(\w+)/) { |
} elsif ($distro =~ /^debian(\w+)/) { |
if ($1 >= 12) { |
if ($1 >= 10) { |
$process = 'mysql'; |
$process = 'mysql'; |
$proc_owner = 'mysql'; |
$proc_owner = 'mysql'; |
|
} |
|
if ($1 >= 11) { |
$mysqldaemon = 'mariadb'; |
$mysqldaemon = 'mariadb'; |
} |
} |
} elsif ($distro =~ /^fedora(\d+)/) { |
} elsif ($distro =~ /^fedora(\d+)/) { |
Line 771 sub chkconfig {
|
Line 773 sub chkconfig {
|
$daemon{'cups'} = 'cupsys'; |
$daemon{'cups'} = 'cupsys'; |
} |
} |
if ((($distro =~ /^ubuntu/) && ($version >= 18)) || |
if ((($distro =~ /^ubuntu/) && ($version >= 18)) || |
(($distro =~ /^debian/) && ($version >= 12))) { |
(($distro =~ /^debian/) && ($version >= 10))) { |
$daemon{'ntp'} = 'chrony'; |
$daemon{'ntp'} = 'chrony'; |
} |
} |
if (($distro =~ /^debian/) && ($version >= 12)) { |
if (($distro =~ /^debian/) && ($version >= 11)) { |
$daemon{'mysql'} = 'mariadb'; |
$daemon{'mysql'} = 'mariadb'; |
} |
} |
} elsif ($distro =~ /^fedora(\d+)/) { |
} elsif ($distro =~ /^fedora(\d+)/) { |
Line 1003 sub chkapache {
|
Line 1005 sub chkapache {
|
my $version = $2; |
my $version = $2; |
my ($stdconf,$stdsite); |
my ($stdconf,$stdsite); |
if ((($distname eq 'ubuntu') && ($version > 12)) || |
if ((($distname eq 'ubuntu') && ($version > 12)) || |
(($distname eq 'debian') && ($version >= 12))) { |
(($distname eq 'debian') && ($version >= 10))) { |
$stdconf = "$instdir/debian-ubuntu/ubuntu14/loncapa_conf"; |
$stdconf = "$instdir/debian-ubuntu/ubuntu14/loncapa_conf"; |
$stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_sites"; |
$stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_sites"; |
} else { |
} else { |
Line 1015 sub chkapache {
|
Line 1017 sub chkapache {
|
} else { |
} else { |
my ($configfile,$sitefile); |
my ($configfile,$sitefile); |
if ((($distname eq 'ubuntu') && ($version > 12)) || |
if ((($distname eq 'ubuntu') && ($version > 12)) || |
(($distname eq 'debian') && ($version >= 12))) { |
(($distname eq 'debian') && ($version >= 10))) { |
$sitefile = '/etc/apache2/sites-available/loncapa.conf'; |
$sitefile = '/etc/apache2/sites-available/loncapa.conf'; |
$configfile = '/etc/apache2/conf-available/loncapa.conf'; |
$configfile = '/etc/apache2/conf-available/loncapa.conf'; |
} else { |
} else { |
Line 1032 sub chkapache {
|
Line 1034 sub chkapache {
|
} |
} |
} |
} |
if ((!$fixapache) && ((($distname eq 'ubuntu') && ($version > 12)) || |
if ((!$fixapache) && ((($distname eq 'ubuntu') && ($version > 12)) || |
(($distname eq 'debian') && ($version >= 12)))) { |
(($distname eq 'debian') && ($version >= 10)))) { |
if (($sitefile ne '') && (-e $sitefile) && (-e $stdsite)) { |
if (($sitefile ne '') && (-e $sitefile) && (-e $stdsite)) { |
if (open(PIPE, "diff --brief $stdsite $sitefile |")) { |
if (open(PIPE, "diff --brief $stdsite $sitefile |")) { |
my $diffres = <PIPE>; |
my $diffres = <PIPE>; |
Line 1944 my %prompts = &texthash(
|
Line 1946 my %prompts = &texthash(
|
mysql => 'Set-up the MySQL database?', |
mysql => 'Set-up the MySQL database?', |
mysqlperms => 'Set-up MySQL permissions?', |
mysqlperms => 'Set-up MySQL permissions?', |
apache => 'Configure Apache web server?', |
apache => 'Configure Apache web server?', |
apachessl => 'Configure SSL for Apache web server?', |
apachessl => 'Configure SSL for Apache web server?', |
runlevels => 'Set overrides for start-up order of services?', |
runlevels => 'Set overrides for start-up order of services?', |
firewall => 'Configure firewall settings for Apache', |
firewall => 'Configure firewall settings for Apache', |
stopsrvcs => 'Stop extra services not required on a LON-CAPA server?', |
stopsrvcs => 'Stop extra services not required on a LON-CAPA server?', |
Line 2367 if ($have_tarball && !$updateshown) {
|
Line 2369 if ($have_tarball && !$updateshown) {
|
} |
} |
$uses_sudo = 1; |
$uses_sudo = 1; |
} elsif ($distro =~ /^debian(\d+)$/) { |
} elsif ($distro =~ /^debian(\d+)$/) { |
if ($1 >= 12) { |
if ($1 >= 10) { |
$lc_uses_systemctl = 1; |
$lc_uses_systemctl = 1; |
} |
} |
} elsif ($distro =~ /^sles(\d+)$/) { |
} elsif ($distro =~ /^sles(\d+)$/) { |
Line 2605 sub kill_extra_services {
|
Line 2607 sub kill_extra_services {
|
if ($distro =~ /^(?:debian|ubuntu)(\d+)/) { |
if ($distro =~ /^(?:debian|ubuntu)(\d+)/) { |
my $version = $1; |
my $version = $1; |
if ((($distro =~ /^ubuntu/) && ($version > 16)) || |
if ((($distro =~ /^ubuntu/) && ($version > 16)) || |
(($distro =~ /^debian/) && ($version >= 12))) { |
(($distro =~ /^debian/) && ($version >= 10))) { |
if (ref($uses_systemctl) eq 'HASH') { |
if (ref($uses_systemctl) eq 'HASH') { |
if ($uses_systemctl->{$service}) { |
if ($uses_systemctl->{$service}) { |
if (`systemctl is-enabled $service`) { |
if (`systemctl is-enabled $service`) { |
Line 3397 sub copy_apache2_debconf {
|
Line 3399 sub copy_apache2_debconf {
|
$version = $2; |
$version = $2; |
} |
} |
if ((($distname eq 'ubuntu') && ($version > 12)) || |
if ((($distname eq 'ubuntu') && ($version > 12)) || |
(($distname eq 'debian') && ($version >= 12))) { |
(($distname eq 'debian') && ($version >= 10))) { |
$defaultconfig = "$apache2_sites_enabled_dir/000-default.conf"; |
$defaultconfig = "$apache2_sites_enabled_dir/000-default.conf"; |
} |
} |
my ($skipconf,$skipsite,$skipstatus); |
my ($skipconf,$skipsite,$skipstatus); |
if ((($distname eq 'ubuntu') && ($version > 12)) || |
if ((($distname eq 'ubuntu') && ($version > 12)) || |
(($distname eq 'debian') && ($version >= 12))) { |
(($distname eq 'debian') && ($version >= 10))) { |
my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled'; |
my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled'; |
my $apache2_conf_available_dir = '/etc/apache2/conf-available'; |
my $apache2_conf_available_dir = '/etc/apache2/conf-available'; |
my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf'; |
my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf'; |