[LON-CAPA-cvs] cvs: doc /loncapafiles langcheck.piml modify_config_files.piml webserver.piml

[raeburn]

raeburn		Tue Jun  3 20:35:04 2014 EDT

  Modified files:              
    /doc/loncapafiles	langcheck.piml modify_config_files.piml 
                     	webserver.piml 
  Log:
  - Support for Ubuntu 14 LTS.
  
  
Index: doc/loncapafiles/langcheck.piml
diff -u doc/loncapafiles/langcheck.piml:1.5 doc/loncapafiles/langcheck.piml:1.6
--- doc/loncapafiles/langcheck.piml:1.5	Thu Dec  5 17:26:03 2013
+++ doc/loncapafiles/langcheck.piml	Tue Jun  3 20:35:04 2014
@@ -49,7 +49,8 @@
         close(PIPE);
     }
 } elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' ||
-         '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12') {
+         '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10' || '<DIST />' eq 'ubuntu12' ||
+         '<DIST />' eq 'ubuntu14') {
     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.25 doc/loncapafiles/modify_config_files.piml:1.26
--- doc/loncapafiles/modify_config_files.piml:1.25	Sun Dec  1 22:29:39 2013
+++ doc/loncapafiles/modify_config_files.piml	Tue Jun  3 20:35:04 2014
@@ -3,7 +3,7 @@
 <!-- modify_config_files.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: modify_config_files.piml,v 1.25 2013/12/01 22:29:39 raeburn Exp $ -->
+<!-- $Id: modify_config_files.piml,v 1.26 2014/06/03 20:35:04 raeburn Exp $ -->
 
 <!--
 
@@ -42,7 +42,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') {
+} elsif ('<DIST />' eq 'debian5' || '<DIST />' eq 'debian6' || '<DIST />' eq 'ubuntu6' || '<DIST />' eq 'ubuntu8' || '<DIST />' eq 'ubuntu10'  || '<DIST />' eq 'ubuntu12' || '<DIST />' eq 'ubuntu14') {
     $configfiles = 'Apt and MySQL';
     $mysqlcmd = '/etc/init.d/mysql restart';
 } elsif (('<DIST />' eq 'fedora16') || ('<DIST />' eq 'fedora17') ||
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.38 doc/loncapafiles/webserver.piml:1.39
--- doc/loncapafiles/webserver.piml:1.38	Sat May  3 15:31:17 2014
+++ doc/loncapafiles/webserver.piml	Tue Jun  3 20:35:04 2014
@@ -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.39 2014/06/03 20:35:04 raeburn Exp $ -->
 
 <!--
 
@@ -47,7 +47,8 @@
 <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='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>
+<target dist='ubuntu14'>/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,9 +56,12 @@
 <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='ubuntu14'>
+/etc/apache2/conf-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'>
 /etc/apache2/default-server.conf
 </dependencies>
@@ -70,7 +74,7 @@
 }
 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,'<<TARGET />');
   while (<IN>) { 
@@ -84,7 +88,8 @@
     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,'<<TARGET />');
   while (<IN>) {