[LON-CAPA-cvs] cvs: loncom /init.d loncontrol.service doc/loncapafiles chkconfig.piml loncapafiles.lpml
raeburn
raeburn at source.lon-capa.org
Fri Oct 26 19:17:24 EDT 2018
raeburn Fri Oct 26 23:17:24 2018 EDT
Added files:
/loncom/init.d loncontrol.service
Modified files:
/doc/loncapafiles chkconfig.piml loncapafiles.lpml
Log:
- Support SLES 15
- systemd (not SysV) runs loncontrol for stop/start/restart LON-CAPA daemons
for: SLES 15, Ubuntu 18.04 LTS, Fedora 26, 27, 28, 29
-------------- next part --------------
Index: doc/loncapafiles/chkconfig.piml
diff -u doc/loncapafiles/chkconfig.piml:1.40 doc/loncapafiles/chkconfig.piml:1.41
--- doc/loncapafiles/chkconfig.piml:1.40 Tue Jun 19 12:26:32 2018
+++ doc/loncapafiles/chkconfig.piml Fri Oct 26 23:17:19 2018
@@ -3,7 +3,7 @@
<!-- checkconfig.piml -->
<!-- Matthew Hall -->
-<!-- $Id: chkconfig.piml,v 1.40 2018/06/19 12:26:32 raeburn Exp $ -->
+<!-- $Id: chkconfig.piml,v 1.41 2018/10/26 23:17:19 raeburn Exp $ -->
<!--
@@ -37,6 +37,7 @@
<perlscript mode="fg">
my $checker_bin = '/sbin/chkconfig';
my $systemctl_bin = '/bin/systemctl';
+my $systemctl_only = 0;
my $webserver ='httpd';
my @runlevels = qw/3 4 5/;
my @norunlevels = qw/0 1 6/;
@@ -48,32 +49,38 @@
} 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' || '<DIST />' eq 'ubuntu16' || '<DIST />' eq 'ubuntu18') {
+} 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';
$webserver = 'apache2';
+} elsif (('<DIST />' eq 'ubuntu18') || ('<DIST />' eq 'sles15')) {
+ $webserver = 'apache2';
+ $use_systemctl = 1;
+ $systemctrl_only = 1;
+} elsif (('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
+ ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'fedora29')) {
+ $use_systemctl = 1;
+ $systemctrl_only = 1;
}
if (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
('<DIST />' eq 'fedora18') || ('<DIST />' eq 'fedora19') ||
('<DIST />' eq 'fedora20') || ('<DIST />' eq 'fedora21') ||
('<DIST />' eq 'fedora22') || ('<DIST />' eq 'fedora23') ||
('<DIST />' eq 'fedora24') || ('<DIST />' eq 'fedora25') ||
- ('<DIST />' eq 'fedora26') || ('<DIST />' eq 'fedora27') ||
- ('<DIST />' eq 'fedora28') || ('<DIST />' eq 'suse12.1') ||
- ('<DIST />' eq 'suse12.2') || ('<DIST />' eq 'suse12.3') ||
- ('<DIST />' eq 'suse13.1') || ('<DIST />' eq 'suse13.2') ||
- ('<DIST />' eq 'sles12') || ('<DIST />' eq 'rhes7') ||
- ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7') ||
- ('<DIST />' eq 'ubuntu18')) {
+ ('<DIST />' eq 'suse12.1') || ('<DIST />' eq 'suse12.2') ||
+ ('<DIST />' eq 'suse12.3') || ('<DIST />' eq 'suse13.1') ||
+ ('<DIST />' eq 'suse13.2') || ('<DIST />' eq 'rhes7') ||
+ ('<DIST />' eq 'centos7') || ('<DIST />' eq 'scientific7') ||
+ ('<DIST />' eq 'sles12')) {
$use_systemctl = 1;
}
-exit if ((! -x $checker_bin) && (! -x $systemctl_bin));
+exit if (((!$systemctl_only) && (! -x $checker_bin)) && (! -x $systemctl_bin));
my $rlstr = join('', at runlevels);
my $nrlstr = join('', at norunlevels);
foreach my $service ($webserver,'loncontrol') {
- if (($use_systemctl) && ($service eq $webserver)) {
+ if (($use_systemctl) && ($service eq $webserver) || ($systemctl_only)) {
my $command = "systemctl is-enabled ".$service.".service";
my $results = `$command`;
chomp($results);
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.971 doc/loncapafiles/loncapafiles.lpml:1.972
--- doc/loncapafiles/loncapafiles.lpml:1.971 Tue Oct 9 20:41:05 2018
+++ doc/loncapafiles/loncapafiles.lpml Fri Oct 26 23:17:19 2018
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.971 2018/10/09 20:41:05 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.972 2018/10/26 23:17:19 raeburn Exp $ -->
<!--
@@ -259,7 +259,7 @@
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/httpd/conf</targetdir>
<targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/apache2</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/apache2</targetdir>
<categoryname>standard</categoryname>
<description>web configuration files</description>
</directory>
@@ -267,7 +267,7 @@
<protectionlevel>modest_delete</protectionlevel>
<targetdir dist='default'>etc/httpd/conf/rewrites</targetdir>
<targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd/rewrites</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/apache2/rewrites</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/apache2/rewrites</targetdir>
<categoryname>standard</categoryname>
<description>
default configuration files to enable/disable http:// -> https:// rewrites
@@ -280,59 +280,59 @@
<description>configuration directory for password authentication mechanism
</description>
</directory>
-<directory dist='default'>
+<directory dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 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 fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 rhes4 rhes5 rhes6 rhes7 scientific5 scientific6 scientific7 centos5 centos6 centos7'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/init.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/init.d</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 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'>etc/init.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run during system startup</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc0.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/rc0.d</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/rc0.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 0</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc1.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/rc1.d</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/rc1.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 1</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc2.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/rc2.d</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/rc2.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 2</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc3.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/rc3.d</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/rc3.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 3</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc4.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/rc4.d</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/rc4.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 4</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc5.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/rc5.d</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/rc5.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 5</description>
</directory>
<directory dist='default'>
<protectionlevel>never_delete</protectionlevel>
<targetdir dist='default'>etc/rc.d/rc6.d</targetdir>
- <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 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'>etc/rc6.d</targetdir>
+ <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18 suse9.2 suse9.3 sles9 sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>etc/rc6.d</targetdir>
<categoryname>standard</categoryname>
<description>scripts that run for run-level 6</description>
</directory>
@@ -1047,7 +1047,7 @@
<file>
<source>loncom/loncapa.conf</source>
<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 ubuntu16 ubuntu18'>etc/apache2/loncapa.conf</target>
+<target dist='sles10 sles11 sles12 sles15 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 ubuntu18'>etc/apache2/loncapa.conf</target>
<categoryname>conf</categoryname>
<description>
<p>
@@ -1090,7 +1090,7 @@
<file type="postaboutversion">
<source>loncom/loncapa_apache.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_apache.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 ubuntu18'>etc/apache2/loncapa_apache.conf</target>
+<target dist='sles10 sles11 sles12 sles15 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 ubuntu18'>etc/apache2/loncapa_apache.conf</target>
<categoryname>static conf</categoryname>
<description>
The goal of this file is to implement all LON-CAPA specific
@@ -1110,7 +1110,7 @@
<file>
<source>loncom/loncapa_apache_local.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_apache_local.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 ubuntu18'>etc/apache2/loncapa_apache_local.conf</target>
+<target dist='sles10 sles11 sles12 sles15 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 ubuntu18'>etc/apache2/loncapa_apache_local.conf</target>
<categoryname>static conf</categoryname>
<description>
Documentation file describing how to add domain-specific Apache configuration
@@ -1123,7 +1123,7 @@
<file>
<source>loncom/startup.pl</source>
<target dist='default'>etc/httpd/conf/startup.pl</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 ubuntu18'>etc/apache2/startup.pl</target>
+<target dist='sles10 sles11 sles12 sles15 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 ubuntu18'>etc/apache2/startup.pl</target>
<categoryname>static conf</categoryname>
<description>
This file provides initializations for perl handlers. It adjusts what
@@ -1145,7 +1145,7 @@
<file>
<source>loncom/rewrites/loncapa_rewrite_off.conf</source>
<target dist='default'>etc/httpd/conf/loncapa_rewrite.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 ubuntu18'>etc/apache2/loncapa_rewrite.conf</target>
+<target dist='sles10 sles11 sles12 sles15 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 ubuntu18'>etc/apache2/loncapa_rewrite.conf</target>
<categoryname>conf</categoryname>
<description>
Default rewrite file.
@@ -1157,11 +1157,11 @@
<source>loncom/rewrites/loncapa_rewrite_on.conf</source>
<target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_on.conf</target>
<target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_on.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 ubuntu18'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target>
+<target dist='sles10 sles11 sles12 sles15 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 ubuntu18'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target>
<categoryname>static conf</categoryname>
<description>
File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or to /etc/httpd/conf/loncapa_rewrite.conf to enable rewriting of
-external requests for http:// to https://
+external requests for http:// to https://
</description>
</file>
<file>
@@ -1176,6 +1176,14 @@
</description>
</file>
<file>
+<source>loncom/configuration/firewalld_loncapa.xml</source>
+<target dist='fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 fedora26 fedora27 fedora28 fedora29 rhes7 scientific7 centos7 sles11'>etc/firewalld/services/loncapa.xml
+</target>
+<categoryname>static conf</categoryname>
+<description>
+
+</description>
+<file>
<source>loncom/thesaurus/thesaurus.db</source>
<target dist='default'>home/httpd/lonTabs/thesaurus.db</target>
<categoryname>system file</categoryname>
@@ -7045,7 +7053,7 @@
<file>
<source>loncom/mime.types</source>
<target dist='default'>etc/httpd/conf/mime.types</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 ubuntu18'>etc/apache2/mime.types</target>
+<target dist='sles10 sles11 sles12 sles15 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 ubuntu18'>etc/apache2/mime.types</target>
<categoryname>www static conf</categoryname>
<description>Expanded mime.types</description>
</file>
@@ -7757,6 +7765,7 @@
compiles/tth.so.i386.perl.5.28;
compiles/tth.so.x86_64.perl.5.28;
compiles/tth.so.x86_64.sles12;
+compiles/tth.so.x86_64.sles15;
compiles/tth.so.i386.debian5;
compiles/tth.so.x86_64.debian5;
</dependencies>
@@ -8636,16 +8645,17 @@
<file>
<source>loncom/init.d/loncontrol</source>
<target dist='default'>etc/rc.d/init.d/loncontrol</target>
-<target 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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18'>etc/init.d/loncontrol</target>
+<target 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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>etc/init.d/loncontrol</target>
+<targetdir dist='fedora26 fedora27 fedora28 fedora29 sles15 ubuntu18'>home/httpd/perl/loncontrol</targetdir>
<categoryname>root script</categoryname>
<description>
Controls the launching/halting of lonc, lond, and lonsql processes.
</description>
</file>
<link>
-<linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
-<linkto 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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18'>etc/init.d/loncontrol</linkto>
-<target dist='default'>
+<linkto dist='fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 rhed4 rhes5 rhes6 rhes7 scientific5 scientific6 scientific7 centos5 centos6 centos7'>etc/rc.d/init.d/loncontrol</linkto>
+<linkto 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 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>etc/init.d/loncontrol</linkto>
+<target dist='fedora1 fedora2 fedora3 fedora4 fedora5 fedora6 fedora7 fedora8 fedora9 fedora10 fedora11 fedora12 fedora13 fedora14 fedora15 fedora16 fedora17 fedora18 fedora19 fedora20 fedora21 fedora22 fedora23 fedora24 fedora25 rhes4 rhes5 rhes6 rhes7 scientific5 scientific6 scientific7 centos5 centos6 centos7'>
etc/rc.d/rc0.d/K05loncontrol;
etc/rc.d/rc1.d/K05loncontrol;
etc/rc.d/rc2.d/K05loncontrol;
@@ -8662,7 +8672,7 @@
etc/rc.d/rc5.d/S95loncontrol;
etc/rc.d/rc6.d/K05loncontrol
</target>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16 ubuntu18'>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14 ubuntu16'>
etc/rc0.d/K05loncontrol;
etc/rc1.d/K05loncontrol;
etc/rc2.d/S95loncontrol;
@@ -8691,6 +8701,18 @@
</dependencies>
</file>
+<file dist="fedora26 fedora27 fedora28 fedora29 sles15 ubuntu18">
+<source>loncom/init.d/loncontrol.service</source>
+<target>etc/systemd/system/loncontrol.service</target>
+<categoryname>root script</categoryname>
+<description>
+Controls the launching/halting of lon-capa daemons by loncontrol
+</description>
+ <installscript>
+-c '/usr/bin/systemctl enable loncontrol.service'
+ </installscript>
+</file>
+
<file>
<source>doc/latex/utf8.def</source>
<target dist='default'>usr/local/loncapa/doc/utf8.def</target>
Index: loncom/init.d/loncontrol.service
+++ loncom/init.d/loncontrol.service
[Unit]
Description=LON-CAPA daemons
Wants=network-online.target nss-lookup.target
After=network-online.target nss-lookup.target syslog.target basic.target mysql.service
[Service]
RemainAfterExit=yes
ExecStart= /home/httpd/perl/loncontrol start
ExecReload=/home/httpd/perl/loncontrol reload
ExecStop=/home/httpd/perl/loncontrol stop
StandardOutput=syslog
StandardError=syslog
[Install]
WantedBy=multi-user.target
More information about the LON-CAPA-cvs
mailing list