[LON-CAPA-cvs] cvs: doc /install/linux install.pl
raeburn
raeburn at source.lon-capa.org
Thu Nov 13 17:15:55 EST 2025
raeburn Thu Nov 13 22:15:55 2025 EDT
Modified files:
/doc/install/linux install.pl
Log:
- Remove trailing whitespace. No code changes.
-------------- next part --------------
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.100 doc/install/linux/install.pl:1.101
--- doc/install/linux/install.pl:1.100 Thu Nov 13 22:08:41 2025
+++ doc/install/linux/install.pl Thu Nov 13 22:15:55 2025
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# The LearningOnline Network
+# The LearningOnline Network
# Pre-installation script for LON-CAPA
#
# Copyright Michigan State University Board of Trustees
@@ -38,26 +38,26 @@
# ========================================================= The language handle
my %languages = (
- ar => 'Arabic',
+ ar => 'Arabic',
de => 'German',
en => 'English',
es => 'Spanish (Castellan)',
fa => 'Persian',
- fr => 'French',
- he => 'Hebrew',
+ fr => 'French',
+ he => 'Hebrew',
ja => 'Japanese',
pt => 'Portuguese',
ru => 'Russian',
tr => 'Turkish',
zh => 'Chinese Simplified'
- );
+ );
use vars qw($lh $lang);
$lang = 'en';
if (@ARGV > 0) {
foreach my $poss (keys(%languages)) {
if ($ARGV[0] eq $poss) {
- $lang = $ARGV[0];
+ $lang = $ARGV[0];
}
}
}
@@ -78,7 +78,7 @@
&mt('Stopping execution.')."\n";
exit;
} else {
- print LOG '$Id: install.pl,v 1.100 2025/11/13 22:08:41 raeburn Exp $'."\n";
+ print LOG '$Id: install.pl,v 1.101 2025/11/13 22:15:55 raeburn Exp $'."\n";
}
#
@@ -348,9 +348,9 @@
#
# get_hostname() prompts the user to provide the server's hostname.
#
-# If invalid input is provided, the routine is called recursively
+# If invalid input is provided, the routine is called recursively
# until, a valid hostname is provided.
-#
+#
sub get_hostname {
my $hostname;
@@ -375,7 +375,7 @@
#
# get_hostip() prompts the user to provide the server's IPv4 IP address
#
-# If invalid input is provided, the routine is called recursively
+# If invalid input is provided, the routine is called recursively
# until, a valid IPv4 address is provided.
#
@@ -387,14 +387,14 @@
$choice =~ s/(^\s+|\s+$)//g;
my $badformat = 1;
if ($choice eq '') {
- print &mt("IP address you entered was either blank or contained only white space.\n");
+ print &mt("IP address you entered was either blank or contained only white space.\n");
} else {
if ($choice =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/) {
if (($1<=255) && ($2<=255) && ($3<=255) && ($4<=255)) {
- $badformat = 0;
+ $badformat = 0;
}
}
- if ($badformat) {
+ if ($badformat) {
print &mt('Host IP you entered was invalid -- a host IP has the format d.d.d.d where each d is an integer between 0 and 255')."\n";
} else {
$hostip = $choice;
@@ -520,7 +520,7 @@
}
}
# Check for locales
- if ($default ne 'en_US.UTF-8') {
+ if ($default ne 'en_US.UTF-8') {
my ($has_us_english,$has_other_code,$has_other_lang);
if (open(PIPE,"locale -a 2>/dev/null |")) {
while (<PIPE>) {
@@ -601,7 +601,7 @@
if ($distro eq '') {
return;
}
- my $gotprereqs = &check_prerequisites($packagecmd,$distro);
+ my $gotprereqs = &check_prerequisites($packagecmd,$distro);
if ($gotprereqs eq '') {
return ($distro,$gotprereqs,'','',$packagecmd,$updatecmd);
}
@@ -676,7 +676,7 @@
($recommended{'apachessl'},$sslhostsfilesref,$has_std,$has_int,$rewritenum,
$nochgstd,$nochgint) = &chkapachessl($distro,$instdir,$hostname,$hostip);
$recommended{'stopsrvcs'} = &chksrvcs($distro,$tostop);
- ($recommended{'download'},$downloadstatus,$filetouse,$production,$testing)
+ ($recommended{'download'},$downloadstatus,$filetouse,$production,$testing)
= &need_download($distro,$instdir);
return ($distro,$gotprereqs,$localecmd,$langcmd,$packagecmd,$updatecmd,$installnow,
$mysqlrestart,\%recommended,$dbh,$has_pass,$mysql_unix_socket,
@@ -782,7 +782,7 @@
print_and_log(&mt('MySQL is running.')."\n");
return 1;
} else {
- print_and_log(&mt('Given up waiting for MySQL to start.')."\n");
+ print_and_log(&mt('Given up waiting for MySQL to start.')."\n");
}
}
}
@@ -903,7 +903,7 @@
if (! -x $checker_bin) {
if ($uses_systemctl{'mysql'} && $uses_systemctl{'apache'}) {
if (! -x $sysctl_bin) {
- $nocheck = 1;
+ $nocheck = 1;
}
} else {
$nocheck = 1;
@@ -1128,11 +1128,11 @@
$stdconf = "$instdir/debian-ubuntu/ubuntu14/loncapa_conf";
$stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_sites";
} else {
- $stdconf = "$instdir/debian-ubuntu/loncapa";
+ $stdconf = "$instdir/debian-ubuntu/loncapa";
}
if (!-e $stdconf) {
$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";
} else {
my ($configfile,$sitefile);
if ((($distname eq 'ubuntu') && ($version > 12)) ||
@@ -1277,7 +1277,7 @@
# chkapachessl() determines whether a server's Apache SSL configuration
# needs updating to support LON-CAPA.
#
-# LON-CAPA uses VirtualHosts for port 443, and requires that they are
+# LON-CAPA uses VirtualHosts for port 443, and requires that they are
# defined in one Apache configuration file containing two VirtualHost
# blocks, in order:
#
@@ -1296,25 +1296,25 @@
# chkapachessl() retrieves the names of .conf files in
# the directory appropriate for the particular Linux distro,
# and then checks to see which .conf file is the best candidate as
-# the single file containing VirtualHosts definitions and
+# the single file containing VirtualHosts definitions and
# <IfModule mod_rewrite.c> </IfModule> rewrite blocks.
#
# The best candidate is the one containing a block:
-# <VirtualHost ????? :443>
+# <VirtualHost ????? :443>
# (where ????? might be _default_ or * or an IP address)
# <IfModule mod_rewrite.c>
# </IfModule>
# </VirtualHost>
-# with the fewest differences between the contents of the
+# with the fewest differences between the contents of the
# IfModule block and the expected contents (from sslrewrite.conf)
#
-# If there are no files with rewrite blocks, then a candidate file
+# If there are no files with rewrite blocks, then a candidate file
# is chosen from the .conf files containing VirtualHosts definitions.
#
# If the user includes "Configure SSL for Apache web server" as
# one of the actions to take to prepare the server for LON-CAPA
# installation, then the output from &chkapachessl() will be
-# used to determined which file will contain VirtualHost configs.
+# used to determined which file will contain VirtualHost configs.
#
# If there are no files containing VirtualHosts definitions, then
# <VirtualHost *:443> </VirtualHost> blocks will be appended to
@@ -1322,7 +1322,7 @@
# ssl.conf for RHEL/CentOS/Scientific/Fedora, vhost-ssl.conf
# for SuSE/SLES, and default-ssl.conf for Ubuntu.
#
-# Once a file is selected, the contents of sslrewrite.conf and
+# Once a file is selected, the contents of sslrewrite.conf and
# loncapassl.conf are compared with appropriate blocks in the file
# and the user will be prompted to agree to insertion of missing
# lines and/or deletion of surplus lines.
@@ -1335,7 +1335,7 @@
my $sslrewriteconf = "$instdir/sslrewrite.conf";
my (%sslfiles,%rewrites,%vhostonly,$has_std,$has_int,$rewritenum,$nochgint,$nochgstd);
$nochgstd = 0;
- $nochgint = 0;
+ $nochgint = 0;
if (!-e $sslintconf) {
$fixapachessl = 0;
print &mt('Warning: LON-CAPA SSL Apache configuration file [_1] needed for installation check.',$sslintconf)."\n";
@@ -1480,7 +1480,7 @@
} else {
if ($mindiffs eq '') {
$mindiffs = scalar(@diffs);
- $rewritenum = 1+$i;
+ $rewritenum = 1+$i;
} elsif (scalar(@diffs) <= $mindiffs) {
$mindiffs = scalar(@diffs);
$rewritenum = 1+$i;
@@ -1655,7 +1655,7 @@
}
}
}
- if ($needs_download) {
+ if ($needs_download) {
if ($production) {
if (exists($localsize{$production})) {
if ($stdsizes->{$production} == $localsize{$production}) {
@@ -1669,13 +1669,13 @@
my @sorted = sort { $b <=> $a } keys(%bymodtime);
my $newest = $sorted[0];
if (ref($bymodtime{$newest}) eq 'ARRAY') {
- $downloadstatus =
+ $downloadstatus =
"Latest LON-CAPA source download in $instdir is: ".
join(',',@{$bymodtime{$newest}})." (downloaded ".
localtime($newest).")\n";
}
} else {
- $downloadstatus =
+ $downloadstatus =
"The $instdir directory already contains the latest LON-CAPA version:".
"\n".$filetouse."\n"."which can be used for installation.\n";
}
@@ -1771,7 +1771,7 @@
if ($DBI::err =~ /1045/) {
print_and_log(&mt('Perhaps the password was incorrect?')."\n");
print &mt('Try again?').' ';
- $currpass = &get_mysql_password(&mt('Re-enter password now'));
+ $currpass = &get_mysql_password(&mt('Re-enter password now'));
$dbh = DBI->connect($dsn,'root',$currpass,{'PrintError'=>0});
if ($dbh) {
$mysqlsetup = 'rootok';
@@ -2019,7 +2019,7 @@
".&mt('1.')." ".&mt('Create the www user/group.')."
".&mt('This is the user/group ownership under which Apache child processes run.')."
- ".&mt('It also owns most directories within the /home/httpd directory.')."
+ ".&mt('It also owns most directories within the /home/httpd directory.')."
".&mt('This directory is where most LON-CAPA files and directories are stored.')."
".&mt('2.')." ".&mt('Install the package LON-CAPA uses to authenticate users.')."
".&mt('3.')." ".&mt('Set-up the MySQL database.')."
@@ -2033,7 +2033,7 @@
".&mt('i.e., services for a print server: [_1] daemon.',"'cups'")."
".&mt('11.')." ".&mt('Download LON-CAPA source code in readiness for installation.')."
-".&mt('Typically, you will run this script only once, when you first install LON-CAPA.')."
+".&mt('Typically, you will run this script only once, when you first install LON-CAPA.')."
".&mt('The script will analyze your system to determine which actions are recommended.')."
".&mt('The script will then prompt you to choose the actions you would like taken.')."
@@ -2041,7 +2041,7 @@
".&mt('For each the recommended action will be selected if you hit Enter/Return.')."
".&mt('To override the default, type the lower case option from the two options listed.')."
".&mt('So, if the default is "yes", ~[Y/n~] will be shown -- type n to override.')."
-".&mt('Whereas if the default is "no", ~[y/N~] will be shown -- type y to override.')."
+".&mt('Whereas if the default is "no", ~[y/N~] will be shown -- type y to override.')."
".&mt('To accept the default, simply hit Enter/Return on your keyboard.')."
".&mt('Otherwise type: y or n then hit the Enter/Return key.')."
@@ -2062,7 +2062,7 @@
my %callsub;
my @actions = ('wwwuser','pwauth','mysql','mysqlperms','apache','systemd',
'apachessl','runlevels','firewall','stopsrvcs','download');
-my %prompts = &texthash(
+my %prompts = &texthash(
wwwuser => "Create the 'www' user?",
pwauth => 'Install the package LON-CAPA uses to authenticate users?',
mysql => 'Set-up the MySQL database?',
@@ -2230,7 +2230,7 @@
print_and_log("\n");
-# Each action: report if skipping, or perform action and provide feedback.
+# Each action: report if skipping, or perform action and provide feedback.
if ($callsub{'wwwuser'}) {
&setup_www();
} else {
@@ -2256,7 +2256,7 @@
if ($dbh) {
&setup_mysql_permissions($dbh,$has_pass,$mysql_unix_socket,$distro);
} else {
- print &mt('Unable to configure MySQL because access is denied.')."\n";
+ print &mt('Unable to configure MySQL because access is denied.')."\n";
}
} else {
&print_and_log(&mt('Skipping MySQL permissions setup.')."\n");
@@ -2284,7 +2284,7 @@
}
if ($callsub{'systemd'}) {
- &check_systemd_update($distro);
+ &check_systemd_update($distro);
} else {
print_and_log('Skipping systemd configuration update for web server');
}
@@ -2296,12 +2296,12 @@
} elsif ($distro =~ /^(debian|ubuntu)/) {
$targetdir = '/etc/apache2/sites-available';
}
- my ($new_rewrite,$new_int) =
+ my ($new_rewrite,$new_int) =
©_apache_sslconf_files($distro,$hostname,$hostip,$instdir,$targetdir,$sslhostsfiles,
- $has_std,$has_int,$rewritenum,$nochgstd,$nochgint);
+ $has_std,$has_int,$rewritenum,$nochgstd,$nochgint);
if ($distro =~ /^(debian|ubuntu)/) {
my $apache2_sites_enabled_dir = '/etc/apache2/sites-enabled';
- if (-d $apache2_sites_enabled_dir) {
+ if (-d $apache2_sites_enabled_dir) {
if ($has_std ne '') {
unless ((-l "$apache2_sites_enabled_dir/$has_std") && (readlink(("$apache2_sites_enabled_dir/$has_std") eq "$targetdir/$has_std"))) {
my $made_symlink = eval { symlink("$targetdir/$has_std","$apache2_sites_enabled_dir/$has_std"); 1};
@@ -2340,7 +2340,7 @@
}
if (!$count) {
print_and_log(&mt('No runlevel updates required.')."\n");
- }
+ }
}
}
if ($distro =~ /^(suse|sles)(\d+)/) {
@@ -2402,7 +2402,7 @@
if ($enable_iptables) {
system('/etc/network/if-pre-up.d/iptables');
print &mt('Firewall enabled using rules defined in [_1].',
- '/etc/iptables.loncapa.rules');
+ '/etc/iptables.loncapa.rules');
}
}
}
@@ -2573,7 +2573,7 @@
#
# Routines for the actions
#
-
+
sub setup_www {
##
## Set up www
@@ -2587,7 +2587,7 @@
} elsif ($status ne '') {
print &mt('Unable to add group [_1].',"'www'")."\n";
}
-
+
my $gid = getgrnam('www');
if (open (PIPE, "/usr/sbin/useradd -c LONCAPA -g $gid www 2>&1 |")) {
@@ -2696,7 +2696,7 @@
##
print_and_log(&mt('Compiling pwauth')."\n");
my $result = `cd $dir/; make 2>/dev/null `;
- my $cstd;
+ my $cstd;
if ($gccver >= 15) {
$cstd = '-std=gnu17';
}
@@ -2779,7 +2779,7 @@
} else {
if (ref($uses_systemctl) eq 'HASH') {
if ($uses_systemctl->{$service}) {
- if (`systemctl is-enabled $service`) {
+ if (`systemctl is-enabled $service`) {
&print_and_log(`systemctl disable $service`);
}
} else {
@@ -2787,7 +2787,7 @@
}
} else {
&print_and_log(`/sbin/chkconfig --del $service`);
- }
+ }
}
}
}
@@ -2822,7 +2822,7 @@
print_and_log(&mt('Skipping MySQL permissions setup.')."\n");
if ($dbh) {
if (@mysql_lc_commands) {
- foreach my $lccmd (@mysql_lc_commands) {
+ foreach my $lccmd (@mysql_lc_commands) {
$dbh->do($lccmd) || print $dbh->errstr."\n";
}
}
@@ -2904,7 +2904,7 @@
my $trial = 0;
while ((!$got_passwd) && ($trial < $maxtries)) {
$firstpass = &get_mysql_password(&mt('Enter password'));
- if (length($firstpass) > 5) {
+ if (length($firstpass) > 5) {
$secondpass = &get_mysql_password(&mt('Enter password a second time'));
if ($firstpass eq $secondpass) {
$got_passwd = 1;
@@ -2965,10 +2965,10 @@
}
sub get_mysql_version {
- my ($distro) = @_;
+ my ($distro) = @_;
my ($version,$minorversion,$subversion,$name);
my $command = 'mysql';
- if ($distro =~ /^sles(\d+)/) {
+ if ($distro =~ /^sles(\d+)/) {
if ($1 >= 16) {
$command = '/usr/bin/mariadb';
}
@@ -3236,36 +3236,36 @@
#
# Starting with LON-CAPA 2.12, name-based virtual hosts are used
# with port 443. The default virtual host (i.e., the one listed
-# first) is for the server's standard hostname, and that is the one
-# which will respond to client browser requests for https:// pages.
+# first) is for the server's standard hostname, and that is the one
+# which will respond to client browser requests for https:// pages.
#
# Accordingly, a system administrator will need to edit the config
-# config file to include paths to a signed SSL certificate (public),
+# config file to include paths to a signed SSL certificate (public),
# chain (public) and key (private) pem files. The certificate should
-# have been signed by a recognized certificate authority ((e.g.,
+# have been signed by a recognized certificate authority ((e.g.,
# InCommon or Let's Encrypt).
-#
+#
# The sslrewrite.conf file contains the rewrite configuration for
-# the default virtual host. The rewrite rules defined are used to
+# the default virtual host. The rewrite rules defined are used to
# allow internal HEAD requests to /cgi-bin/mimetex.cgi to be served
# http://, in order to support vertical alignment of mimetex images
# (one of the options for rendering Math content); (b) allow requests
# for certain URLs (external resource, and syllabus, if external URL
-# used) to be served http:// to accommodate the use of iframes which
+# used) to be served http:// to accommodate the use of iframes which
# would otherwise result in browser blocking of mixed active content.
#
-# The loncapassl.conf file contains the configuration for the
+# The loncapassl.conf file contains the configuration for the
# "internal" virtual host, which will respond to requests for https://
# pages from other LON-CAPA servers in the network to which the node
# belongs. The ServerName is internal-<hostname> where <hostname>
-# is the server's hostname. There is no need to create a DNS entry
+# is the server's hostname. There is no need to create a DNS entry
# for internal-<hostname>, as LON-CAPA 2.12 automatically performs
# the required hostname to IP mapping.
-#
+#
# Requests to /raw on the "internal" virtual host require a valid
# SSL client certificate, signed by the certificate authority
# for the LON-CAPA network to which the node belongs.
-#
+#
# The configuration file to which the contents of sslrewrite.conf
# and loncapassl.conf will be written will have either been identified
# when &chkapachessl() was run, or if no files were found with
@@ -3340,7 +3340,7 @@
"</VirtualHost>\n\n".
join('', at saved);
close($fhout);
- $new_int = $has_int;
+ $new_int = $has_int;
}
}
}
@@ -3369,7 +3369,7 @@
}
if (($has_std eq '') && ($has_int eq '')) {
my ($file,$numfiles) = &get_sslconf_filename($distro,$targetdir,$targetfilesref);
- if ($numfiles == 0) {
+ if ($numfiles == 0) {
if (open(my $fhout, '>>', "$targetdir/$file")) {
print $fhout "<VirtualHost *:443>\n".
"ServerName $hostname\n".
@@ -3413,7 +3413,7 @@
}
#
-# append_to_vhost() is called to add rewrite rules (in a
+# append_to_vhost() is called to add rewrite rules (in a
# <IfModule +mod_rewrite.c> </IfModule> block), provided
# in the sslrewrite.conf configuration file, to an Apache
# SSL configuration file within a VirtualHost for port 443
@@ -3451,10 +3451,10 @@
$virtualhost = 0;
unless ($endvhost) {
if (((($currname eq '') || ($currname eq $hostname)) && ($type eq 'std')) ||
- (($currname eq 'internal-'.$hostname) && ($type eq 'int'))) {
+ (($currname eq 'internal-'.$hostname) && ($type eq 'int'))) {
$endvhost = $currline;
} else {
- undef($startvhost);
+ undef($startvhost);
}
}
}
@@ -3488,8 +3488,8 @@
# get_sslconf_filename() is called when the Apache SSL configuration
# option has been selected and there are no files containing
# VirtualHost definitions containing rewrite blocks,
-#
-# In this case get_sslconf_filename() is used to chose from the
+#
+# In this case get_sslconf_filename() is used to chose from the
# available .conf files containing VirtualHosts definitions. If
# there is ambiguity about which file to use, &apacheconf_choice()
# will be called to prompt the user to choose one of the possible
@@ -3540,7 +3540,7 @@
my $choice = &apacheconf_choice($max);
if (($choice =~ /^\d+$/) && ($choice >= 1) && ($choice <= $max)) {
$configfile = $possfiles[$choice-1];
- $numfiles = 1;
+ $numfiles = 1;
} else {
$numfiles = -1;
}
@@ -3550,7 +3550,7 @@
}
#
-# &apacheconf_choice() prompts a user to choose an integer between 1 and the
+# &apacheconf_choice() prompts a user to choose an integer between 1 and the
# maximum number of available of possible Apache SSL config files found
# at the distros standard location for Apache config files containing
# VirtualHost definitions.
@@ -3566,7 +3566,7 @@
my $configfile;
if (($choice =~ /^\d+$/) && ($choice >= 1) && ($choice <= $max)) {
$configfile = $choice;
- }
+ }
while ($configfile eq '') {
print &mt('Invalid choice. Please enter a number between 1 and [_1].',$max)."\n";
$configfile = &apacheconf_choice($max);
@@ -3578,16 +3578,16 @@
#
# &modify_ssl_config() is called to modify the contents of an Apache SSL config
# file so that it has two <VirtualHost *:443> </VirtualHost> blocks containing
-# (a) the default VirtualHost with the <IfModule mod_rewrite.c> </IfModule> block
-# provided in sslrewrites.conf, and (b) an "internal" VirtualHost with the
+# (a) the default VirtualHost with the <IfModule mod_rewrite.c> </IfModule> block
+# provided in sslrewrites.conf, and (b) an "internal" VirtualHost with the
# content provided in loncapassl.conf.
#
# This routine will prompted you to agree to insertion of lines present in the
# shipped conf file, but missing from the local config file, and also for
# deletion of lines present in the local config file, but not required in
# the shipped conf file.
-#
-
+#
+
sub modify_ssl_config {
my ($targetdir,$filename,$hostname,$rewritenum,$by_linetext,$by_linenum,$type) = @_;
return unless ((ref($by_linetext) eq 'HASH') && (ref($by_linenum) eq 'HASH'));
@@ -3610,7 +3610,7 @@
if ((exists($by_linetext->{$_})) && (ref($by_linetext->{$_}) eq 'ARRAY') &&
(@{$by_linetext->{$_}} > 0)) {
$possible{$currline} = shift(@{$by_linetext->{$_}});
- }
+ }
if (/^\s*<\/VirtualHost>/) {
if ((($currname eq 'internal-'.$hostname) && ($type eq 'int')) ||
((($currname eq $hostname) || ($currname eq '')) && ($type eq 'std') &&
@@ -3619,10 +3619,10 @@
} else {
foreach my $line (sort {$b <=> $a } keys(%possible)) {
my $num = $possible{$line};
- if (ref($by_linetext->{$by_linenum->{$num}}) eq 'ARRAY') {
+ if (ref($by_linetext->{$by_linenum->{$num}}) eq 'ARRAY') {
unshift(@{$by_linetext->{$by_linenum->{$num}}},$num);
}
- }
+ }
}
undef(%possible);
$virtualhost = 0;
@@ -3915,8 +3915,8 @@
###########################################################
##
## openSuSE/SLES Copy apache2 config files:
-## default-server.conf, uid.conf, /etc/sysconfig/apache2
-## and create symlink from /srv/www/conf to /etc/apache2
+## default-server.conf, uid.conf, /etc/sysconfig/apache2
+## and create symlink from /srv/www/conf to /etc/apache2
##
###########################################################
@@ -3944,7 +3944,7 @@
&print_and_log(&mt('Symlink creation failed for [_1] to [_2]. You will need to perform this action from the command line.',"'/srv/www/conf'","'/etc/apache2'")."\n");
}
©_apache2_conf_files($instdir);
- ©_sysconfig_apache2_file($instdir,$name,$version);
+ ©_sysconfig_apache2_file($instdir,$name,$version);
print_and_log("\n");
}
@@ -3966,7 +3966,7 @@
###############################################
##
-## Modify /etc/sysconfig/apache2
+## Modify /etc/sysconfig/apache2
##
###############################################
sub copy_sysconfig_apache2_file {
@@ -3994,7 +3994,7 @@
print_and_log(&mt('Copying the LON-CAPA [_1] to [_2].',"'SuSEfirewall2_setup'","'/etc/insserv/overrides/SuSEfirewall2_setup'")."\n");
if (!-e "/etc/insserv/overrides/SuSEfirewall2_setup") {
if (!-d "/etc/insserv") {
- mkdir("/etc/insserv",0755);
+ mkdir("/etc/insserv",0755);
}
if (!-d "/etc/insserv/overrides") {
mkdir("/etc/insserv/overrides",0755);
@@ -4018,7 +4018,7 @@
if (ref($apachefw) eq 'HASH') {
foreach my $service ('http','https') {
unless ($apachefw->{$service}) {
- push (@ports,$service);
+ push (@ports,$service);
}
}
} else {
@@ -4076,7 +4076,7 @@
system("wget http://install.loncapa.org/versions/$lctarball ".
"2>/dev/null 1>/dev/null");
if (! -e "./$lctarball") {
- print &mt('Unable to retrieve LON-CAPA source files from: [_1].',
+ print &mt('Unable to retrieve LON-CAPA source files from: [_1].',
"http://install.loncapa.org/versions/$lctarball")."\n";
} else {
$have_tarball = 1;
More information about the LON-CAPA-cvs
mailing list