[LON-CAPA-cvs] cvs: doc /loncapafiles chkconfig.piml langcheck.piml modify_config_files.piml ntpcheck.piml picins_check.piml sanitycheck.piml updatequery.piml verify_domconfiguser.piml wrap_setuid.piml
raeburn
raeburn at source.lon-capa.org
Sat Apr 9 15:04:39 EDT 2016
raeburn Sat Apr 9 19:04:39 2016 EDT
Modified files:
/doc/loncapafiles chkconfig.piml langcheck.piml
modify_config_files.piml ntpcheck.piml
picins_check.piml sanitycheck.piml
updatequery.piml verify_domconfiguser.piml
wrap_setuid.piml
Log:
- Support Ubuntu 16 LTS.
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.34 doc/loncapafiles/chkconfig.piml:1.35
--- doc/loncapafiles/chkconfig.piml:1.34 Sat Jan 3 03:00:18 2015
+++ doc/loncapafiles/chkconfig.piml Sat Apr 9 19:04:39 2016
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.34 2015/01/03 03:00:18 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.35 2016/04/09 19:04:39 raeburn Exp $ -->
<!--
@@ -48,7 +48,7 @@
} elsif ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2') {
$webserver = 'apache2';
@runlevels = qw/3 5/;
-} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
@runlevels = qw/2 3 4 5/;
@norunlevels = qw/0 1 6/;
$checker_bin = '/usr/sbin/sysv-rc-conf';
@@ -84,7 +84,7 @@
if ($results eq '') {
print "**** WARNING: $service is not set to run on boot.$/".
" Execute the following commands to fix this:".$/;
- if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
+ if ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
print " $checker_bin --level $nrlstr $service off".$/;
} else {
print " $checker_bin --add $webserver".$/;
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.10 doc/loncapafiles/langcheck.piml:1.11
--- doc/loncapafiles/langcheck.piml:1.10 Mon Mar 16 05:18:59 2015
+++ doc/loncapafiles/langcheck.piml Sat Apr 9 19:04:39 2016
@@ -50,7 +50,7 @@
}
} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||
'<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' ||
- '<DIST />' eq 'ubuntu14') {
+ '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
if (open(PIPE,"cat /etc/default/locale |grep '^LANG' |")) {
print "Checking OS language";
if (<PIPE> =~ /^LANG="en/) {
Index: doc/loncapafiles/modify_config_files.piml
diff -u doc/loncapafiles/modify_config_files.piml:1.30 doc/loncapafiles/modify_config_files.piml:1.31
--- doc/loncapafiles/modify_config_files.piml:1.30 Sat Jan 3 03:00:18 2015
+++ doc/loncapafiles/modify_config_files.piml Sat Apr 9 19:04:39 2016
@@ -3,7 +3,7 @@
<!-- modify_config_files.piml -->
<!-- Matthew Hall -->
-<!-- $Id: modify_config_files.piml,v 1.30 2015/01/03 03:00:18 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.31 2016/04/09 19:04:39 raeburn Exp $ -->
<!--
@@ -45,7 +45,7 @@
$configfiles = 'MySQL';
} elsif ('<DIST />' eq 'rhes4') {
$configfiles = 'MySQL';
-} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
$configfiles = 'Apt and MySQL';
$mysqlcmd = '/etc/init.d/mysql restart';
} elsif (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
Index: doc/loncapafiles/ntpcheck.piml
diff -u doc/loncapafiles/ntpcheck.piml:1.25 doc/loncapafiles/ntpcheck.piml:1.26
--- doc/loncapafiles/ntpcheck.piml:1.25 Thu Jan 1 00:24:17 2015
+++ doc/loncapafiles/ntpcheck.piml Sat Apr 9 19:04:39 2016
@@ -3,7 +3,7 @@
<!-- ntpcheck.piml -->
<!-- Matthew Hall -->
-<!-- $Id: ntpcheck.piml,v 1.25 2015/01/01 00:24:17 raeburn Exp $ -->
+<!-- $Id: ntpcheck.piml,v 1.26 2016/04/09 19:04:39 raeburn Exp $ -->
<!--
@@ -94,7 +94,7 @@
my $restartchk;
if (('<DIST />' eq 'debian5') || ('<DIST />' eq 'debian6') || ('<DIST />' eq 'ubuntu6') ||
('<DIST />' eq 'ubuntu8') || ('<DIST />' eq 'ubuntu10') || ('<DIST />' eq 'ubuntu12') ||
- ('<DIST />' eq 'ubuntu14')) {
+ ('<DIST />' eq 'ubuntu14') || ('<DIST />' eq 'ubuntu16')) {
$checking_bin = '/usr/sbin/sysv-rc-conf';
} else {
$checking_bin = '/sbin/chkconfig';
Index: doc/loncapafiles/picins_check.piml
diff -u doc/loncapafiles/picins_check.piml:1.29 doc/loncapafiles/picins_check.piml:1.30
--- doc/loncapafiles/picins_check.piml:1.29 Sat Jan 3 03:00:18 2015
+++ doc/loncapafiles/picins_check.piml Sat Apr 9 19:04:39 2016
@@ -3,7 +3,7 @@
<!-- picins_check.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: picins_check.piml,v 1.29 2015/01/03 03:00:18 raeburn Exp $ -->
+<!-- $Id: picins_check.piml,v 1.30 2016/04/09 19:04:39 raeburn Exp $ -->
<!--
@@ -32,7 +32,7 @@
<piml>
<files>
<file>
-<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 rhes6 scientific6 centos6 rhes7 scientific7 centos7 sles11 sles12 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14">
+<perlscript mode="fg" dist="fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 rhes6 scientific6 centos6 rhes7 scientific7 centos7 sles11 sles12 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16">
my $picinspath = '/usr/share/texmf/tex/latex/picins';
my $file = 'picins.sty';
if (!-e "$picinspath/$file") {
Index: doc/loncapafiles/sanitycheck.piml
diff -u doc/loncapafiles/sanitycheck.piml:1.43 doc/loncapafiles/sanitycheck.piml:1.44
--- doc/loncapafiles/sanitycheck.piml:1.43 Sat Jan 3 03:00:18 2015
+++ doc/loncapafiles/sanitycheck.piml Sat Apr 9 19:04:39 2016
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/piml.dtd">
<!-- sanitycheck.piml -->
-<!-- $Id: sanitycheck.piml,v 1.43 2015/01/03 03:00:18 raeburn Exp $ -->
+<!-- $Id: sanitycheck.piml,v 1.44 2016/04/09 19:04:39 raeburn Exp $ -->
<!--
@@ -61,7 +61,7 @@
<file>
<target dist='default'>/var/lib/mysql/mysql.sock</target>
<target dist='suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 sles12'>/var/run/mysql/mysql.sock</target>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>/var/run/mysqld/mysqld.sock</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>/var/run/mysqld/mysqld.sock</target>
<perlscript mode='fg'>
unless
(-e '<TARGET />') # Does file exist?
@@ -113,7 +113,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>/etc/apache2/loncapa.conf</target>
+<target dist='sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>/etc/apache2/loncapa.conf</target>
<perlscript mode='fg'>
open IN, "<<TARGET />";
my $hbug=-1;
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.80 doc/loncapafiles/updatequery.piml:1.81
--- doc/loncapafiles/updatequery.piml:1.80 Sat Jan 3 03:00:18 2015
+++ doc/loncapafiles/updatequery.piml Sat Apr 9 19:04:39 2016
@@ -1,6 +1,6 @@
<!-- updatequery.piml -->
-<!-- $Id: updatequery.piml,v 1.80 2015/01/03 03:00:18 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.81 2016/04/09 19:04:39 raeburn Exp $ -->
<!--
@@ -546,7 +546,7 @@
# update loncapa.conf
my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16') {
$confdir = '/etc/apache2/';
}
my $filename='loncapa.conf';
@@ -603,7 +603,7 @@
</file>
<file>
<target dist='default'>/etc/httpd/conf/</target>
-<target dist='sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>/etc/apache2/</target>
+<target dist='sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>/etc/apache2/</target>
<perlscript mode='fg'>
sub securesetting {
my (%perlvar)=@_;
Index: doc/loncapafiles/verify_domconfiguser.piml
diff -u doc/loncapafiles/verify_domconfiguser.piml:1.24 doc/loncapafiles/verify_domconfiguser.piml:1.25
--- doc/loncapafiles/verify_domconfiguser.piml:1.24 Tue Apr 7 17:35:54 2015
+++ doc/loncapafiles/verify_domconfiguser.piml Sat Apr 9 19:04:39 2016
@@ -3,7 +3,7 @@
<!-- verify_domconfiguser.piml -->
<!-- Stuart Raeburn -->
-<!-- $Id: verify_domconfiguser.piml,v 1.24 2015/04/07 17:35:54 raeburn Exp $ -->
+<!-- $Id: verify_domconfiguser.piml,v 1.25 2016/04/09 19:04:39 raeburn Exp $ -->
<!--
@@ -40,7 +40,7 @@
my @conffiles = ('loncapa.conf','loncapa_apache.conf');
my %perlvar;
my $confdir = '/etc/httpd/conf/';
-if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
+if ('<DIST />' eq 'sles10' || '<DIST />' eq 'sles11' || '<DIST />' eq 'sles12' || '<DIST />' eq 'suse10.1' || '<DIST />' eq 'suse10.2' || '<DIST />' eq 'suse10.3' || '<DIST />' eq 'suse11.1' || '<DIST />' eq 'suse11.2' || '<DIST />' eq 'suse11.3' || '<DIST />' eq 'suse11.4' || '<DIST />' eq 'suse12.1' || '<DIST />' eq 'suse12.2' || '<DIST />' eq 'suse12.3' || '<DIST />' eq 'suse13.1' || '<DIST />' eq 'suse13.2' || '<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14' || '<DIST />' eq 'ubuntu16' ) {
$confdir = '/etc/apache2/';
}
foreach my $filename (@conffiles) {
Index: doc/loncapafiles/wrap_setuid.piml
diff -u doc/loncapafiles/wrap_setuid.piml:1.29 doc/loncapafiles/wrap_setuid.piml:1.30
--- doc/loncapafiles/wrap_setuid.piml:1.29 Sat Jan 3 03:00:18 2015
+++ doc/loncapafiles/wrap_setuid.piml Sat Apr 9 19:04:39 2016
@@ -3,7 +3,7 @@
<!-- wrap_setuid.piml -->
<!-- Guy Albertelli -->
-<!-- $Id: wrap_setuid.piml,v 1.29 2015/01/03 03:00:18 raeburn Exp $ -->
+<!-- $Id: wrap_setuid.piml,v 1.30 2016/04/09 19:04:39 raeburn Exp $ -->
<!--
@@ -37,7 +37,7 @@
<perlscript mode="fg" dist="default">
#print("Not wrapping setuid scripts\n");
</perlscript>
-<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 ubuntu12 ubuntu14 rhes7 centos7 scientific7">
+<perlscript mode="fg" dist="suse9.2 suse9.3 sles9 sles10 sles11 sles12 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 ubuntu12 ubuntu14 ubuntu16 rhes7 centos7 scientific7">
$fslist='<TARGET />';
open(FIND, "find <TARGET /> -xdev -type f \\( -perm -04000 -o -perm -02000 \\) -print|");
More information about the LON-CAPA-cvs
mailing list