[LON-CAPA-cvs] cvs: doc /install/linux install.pl
raeburn
raeburn at source.lon-capa.org
Wed Jun 19 20:29:49 EDT 2024
raeburn Thu Jun 20 00:29:49 2024 EDT
Modified files:
/doc/install/linux install.pl
Log:
- Support Debian 10 (buster) and 11 (bullseye)
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.89 doc/install/linux/install.pl:1.90
--- doc/install/linux/install.pl:1.89 Thu Jun 13 01:21:59 2024
+++ doc/install/linux/install.pl Thu Jun 20 00:29:49 2024
@@ -78,7 +78,7 @@
&mt('Stopping execution.')."\n";
exit;
} else {
- print LOG '$Id: install.pl,v 1.89 2024/06/13 01:21:59 raeburn Exp $'."\n";
+ print LOG '$Id: install.pl,v 1.90 2024/06/20 00:29:49 raeburn Exp $'."\n";
}
#
@@ -623,9 +623,11 @@
$proc_owner = 'mysql';
}
} elsif ($distro =~ /^debian(\w+)/) {
- if ($1 >= 12) {
+ if ($1 >= 10) {
$process = 'mysql';
$proc_owner = 'mysql';
+ }
+ if ($1 >= 11) {
$mysqldaemon = 'mariadb';
}
} elsif ($distro =~ /^fedora(\d+)/) {
@@ -771,10 +773,10 @@
$daemon{'cups'} = 'cupsys';
}
if ((($distro =~ /^ubuntu/) && ($version >= 18)) ||
- (($distro =~ /^debian/) && ($version >= 12))) {
+ (($distro =~ /^debian/) && ($version >= 10))) {
$daemon{'ntp'} = 'chrony';
}
- if (($distro =~ /^debian/) && ($version >= 12)) {
+ if (($distro =~ /^debian/) && ($version >= 11)) {
$daemon{'mysql'} = 'mariadb';
}
} elsif ($distro =~ /^fedora(\d+)/) {
@@ -1003,7 +1005,7 @@
my $version = $2;
my ($stdconf,$stdsite);
if ((($distname eq 'ubuntu') && ($version > 12)) ||
- (($distname eq 'debian') && ($version >= 12))) {
+ (($distname eq 'debian') && ($version >= 10))) {
$stdconf = "$instdir/debian-ubuntu/ubuntu14/loncapa_conf";
$stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_sites";
} else {
@@ -1015,7 +1017,7 @@
} else {
my ($configfile,$sitefile);
if ((($distname eq 'ubuntu') && ($version > 12)) ||
- (($distname eq 'debian') && ($version >= 12))) {
+ (($distname eq 'debian') && ($version >= 10))) {
$sitefile = '/etc/apache2/sites-available/loncapa.conf';
$configfile = '/etc/apache2/conf-available/loncapa.conf';
} else {
@@ -1032,7 +1034,7 @@
}
}
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 (open(PIPE, "diff --brief $stdsite $sitefile |")) {
my $diffres = <PIPE>;
@@ -1944,7 +1946,7 @@
mysql => 'Set-up the MySQL database?',
mysqlperms => 'Set-up MySQL permissions?',
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?',
firewall => 'Configure firewall settings for Apache',
stopsrvcs => 'Stop extra services not required on a LON-CAPA server?',
@@ -2367,7 +2369,7 @@
}
$uses_sudo = 1;
} elsif ($distro =~ /^debian(\d+)$/) {
- if ($1 >= 12) {
+ if ($1 >= 10) {
$lc_uses_systemctl = 1;
}
} elsif ($distro =~ /^sles(\d+)$/) {
@@ -2605,7 +2607,7 @@
if ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
my $version = $1;
if ((($distro =~ /^ubuntu/) && ($version > 16)) ||
- (($distro =~ /^debian/) && ($version >= 12))) {
+ (($distro =~ /^debian/) && ($version >= 10))) {
if (ref($uses_systemctl) eq 'HASH') {
if ($uses_systemctl->{$service}) {
if (`systemctl is-enabled $service`) {
@@ -3397,12 +3399,12 @@
$version = $2;
}
if ((($distname eq 'ubuntu') && ($version > 12)) ||
- (($distname eq 'debian') && ($version >= 12))) {
+ (($distname eq 'debian') && ($version >= 10))) {
$defaultconfig = "$apache2_sites_enabled_dir/000-default.conf";
}
my ($skipconf,$skipsite,$skipstatus);
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_available_dir = '/etc/apache2/conf-available';
my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf';
More information about the LON-CAPA-cvs
mailing list