[LON-CAPA-cvs] cvs: doc /install/linux install.pl /install/linux/debian-ubuntu/ubuntu14 loncapa_conf loncapa_site

[raeburn]

raeburn		Wed Oct 29 20:56:23 2014 EDT

  Added files:                 
    /doc/install/linux/debian-ubuntu/ubuntu14	loncapa_site loncapa_conf 

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Ubuntu14 LTS 
    - use both conf-enabled and sites-enabled.
    - to support rewrite form http -> https include loncapa_rewrite_conf 
      in VirtualHost block for port 80 in sites-enabled/loncapa
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.31 doc/install/linux/install.pl:1.32
--- doc/install/linux/install.pl:1.31	Mon Jun 30 14:55:40 2014
+++ doc/install/linux/install.pl	Wed Oct 29 20:56:18 2014
@@ -72,7 +72,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.31 2014/06/30 14:55:40 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.32 2014/10/29 20:56:18 raeburn Exp $'."\n";
 }
 
 #
@@ -1849,15 +1849,23 @@
         unlink($defaultconfig);
     }
     if (($distname eq 'ubuntu') && ($version > 12)) {
-        print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from conf-enabled.',"'apache2'","'/etc/apache2/conf-available'","'loncapa symlink'")."\n");
+        print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from conf-enabled.',"'apache2'","'/etc/apache2/conf-available'","'loncapa.conf symlink'")."\n");
         my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled';
         my $apache2_conf_available_dir = '/etc/apache2/conf-available';
         if (-e "$apache2_conf_available_dir/loncapa") {
             copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");
         }
-        copy("$instdir/debian-ubuntu/loncapa","$apache2_conf_available_dir/loncapa");
+        my $defaultconf = $apache2_conf_available_dir.'/loncapa.conf';
+        copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa");
         chmod(0444,"$apache2_conf_available_dir/loncapa");
-        symlink("$apache2_conf_available_dir/loncapa","$apache2_conf_enabled_dir/loncapa.conf");
+        if (-l $defaultconf) {
+            unlink($defaultconf);
+        }
+        symlink("$apache2_conf_available_dir/loncapa","$defaultconf");
+        print_and_log(&mt('Copying loncapa [_1] site file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default.conf symlink'")."\n");
+        copy("$instdir/debian-ubuntu/ubuntu14/loncapa_site","$apache2_sites_available_dir/loncapa");
+        chmod(0444,"$apache2_sites_available_dir/loncapa");
+        symlink("$apache2_sites_available_dir/loncapa","$defaultconfig");
     } else {
         print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default symlink'")."\n");
         if (-e "$apache2_sites_available_dir/loncapa") {