[LON-CAPA-cvs] cvs: doc /install/linux install.pl

[raeburn]

raeburn		Thu May 26 13:33:31 2011 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Rename debian-ubuntu/apache2.conf as debian-ubuntu/loncapa for 
    consistency with target.
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.16 doc/install/linux/install.pl:1.17
--- doc/install/linux/install.pl:1.16	Tue May 24 00:17:37 2011
+++ doc/install/linux/install.pl	Thu May 26 13:33:30 2011
@@ -72,7 +72,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.16 2011/05/24 00:17:37 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.17 2011/05/26 13:33:30 raeburn Exp $'."\n";
 }
 
 #
@@ -600,11 +600,11 @@
     my ($distro,$instdir) = @_;
     my $fixapache = 1;
     if ($distro =~ /^(debian|ubuntu)/) {
-        if (!-e "$instdir/debian-ubuntu/apache2.conf") {
+        if (!-e "$instdir/debian-ubuntu/loncapa") {
             $fixapache = 0;
             print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n"; 
-        } elsif ((-e "/etc/apache2/sites-available/loncapa") && (-e "$instdir/debian-ubuntu/apache2.conf")) {
-            if (open(PIPE, "diff --brief $instdir/debian-ubuntu/apache2.conf /etc/apache2/sites-available/loncapa |")) {
+        } elsif ((-e "/etc/apache2/sites-available/loncapa") && (-e "$instdir/debian-ubuntu/loncapa")) {
+            if (open(PIPE, "diff --brief $instdir/debian-ubuntu/loncapa /etc/apache2/sites-available/loncapa |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -1720,7 +1720,7 @@
 
 #########################################################
 ##
-## Ubuntu/Debian -- copy our apache2 configuration file to
+## Ubuntu/Debian -- copy our loncapa configuration file to
 ## sites-available and set the symlink from sites-enabled.
 ##
 #########################################################
@@ -1736,7 +1736,7 @@
     if (-e "$apache2_sites_available_dir/loncapa") {
         copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
     }
-    copy("$instdir/debian-ubuntu/apache2.conf","$apache2_sites_available_dir/loncapa");
+    copy("$instdir/debian-ubuntu/loncapa","$apache2_sites_available_dir/loncapa");
     chmod(0444,"$apache2_sites_available_dir/loncapa");
     symlink("$apache2_sites_available_dir/loncapa","$apache2_sites_enabled_dir/000-default");
     my $apache2_mods_enabled_dir = '/etc/apache2/mods-enabled';