--- doc/loncapafiles/webserver.piml	2014/05/03 15:31:17	1.38
+++ doc/loncapafiles/webserver.piml	2018/06/19 12:26:32	1.43
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.38 2014/05/03 15:31:17 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.43 2018/06/19 12:26:32 raeburn Exp $ -->
 
 <!--
 
@@ -46,8 +46,9 @@ http://www.lon-capa.org/
 <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>
 <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>/etc/apache2/default-server.conf</target>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>/etc/apache2/sites-available/loncapa</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'>/etc/apache2/default-server.conf</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>
+<target dist='ubuntu14 ubuntu16 ubuntu18'>/etc/apache2/conf-available/loncapa</target>
 <note>This is for Apache 1.X for Red Hat 4ES, Fedora 2, 3 and 4, SusSE 9.2 and 9.3, and SLES 9 distributions. This is for Apache 2.X for Fedora 5, Red Hat 5, CentOS 5, Scientific Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later distributions</note>
 <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf
@@ -55,10 +56,13 @@ http://www.lon-capa.org/
 <dependencies dist='suse9.2 suse9.3 sles9'>
 /etc/httpd/httpd.conf
 </dependencies>
-<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>
+<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
 /etc/apache2/sites-available/loncapa
 </dependencies>
-<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>
+<dependencies dist='ubuntu14 ubuntu16 ubuntu18'>
+/etc/apache2/conf-available/loncapa
+</dependencies>
+<dependencies 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'>
 /etc/apache2/default-server.conf
 </dependencies>
 <perlscript mode='fg' dist="default">
@@ -70,7 +74,7 @@ unless (-e "<TARGET />") {
 }
 else {
   # Append loncapa_apache.conf inclusion to httpd.conf 
-  # (or sites-available/loncapa) if not present.
+  # (or sites-available/loncapa or conf-available/loncapa) if not present.
   $flag=0;
   open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) { 
@@ -84,7 +88,8 @@ else {
     print(OUT 'Include conf/loncapa_apache.conf'."\n");
     close(OUT);
   }
-  # Remove loncapa.conf inclusion from httpd.conf if present.
+  # Remove loncapa.conf inclusion from httpd.conf 
+  # (or sites-available/loncapa or conf-available/loncapa) if present.
   $flag=0;
   open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {