--- doc/install/linux/install.pl	2020/11/11 20:58:37	1.68
+++ doc/install/linux/install.pl	2021/03/13 00:04:36	1.70
@@ -29,6 +29,7 @@ use Term::ReadKey;
 use Socket;
 use Sys::Hostname::FQDN();
 use DBI;
+use File::Spec;
 use Cwd();
 use File::Basename();
 use lib File::Basename::dirname(Cwd::abs_path($0));
@@ -77,7 +78,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.68 2020/11/11 20:58:37 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.70 2021/03/13 00:04:36 raeburn Exp $'."\n";
 }
 
 #
@@ -983,10 +984,10 @@ sub chkapache {
         } else {
             my ($configfile,$sitefile);
             if (($distname eq 'ubuntu') && ($version > 12)) {
-                $sitefile = '/etc/apache2/sites-available/loncapa';
-                $configfile = "/etc/apache2/conf-available/loncapa";
+                $sitefile = '/etc/apache2/sites-available/loncapa.conf';
+                $configfile = '/etc/apache2/conf-available/loncapa.conf';
             } else {
-                $configfile = "/etc/apache2/sites-available/loncapa";
+                $configfile = '/etc/apache2/sites-available/loncapa';
             }
             if (($configfile ne '') && (-e $configfile) && (-e $stdconf))  {
                 if (open(PIPE, "diff --brief $stdconf $configfile |")) {
@@ -3193,6 +3194,7 @@ sub copy_apache2_debconf {
     my $apache2_sites_enabled_dir = '/etc/apache2/sites-enabled';
     my $apache2_sites_available_dir = '/etc/apache2/sites-available';
     my $defaultconfig = "$apache2_sites_enabled_dir/000-default";
+    my $defaultsite = "$apache2_sites_enabled_dir/loncapa.conf";
     my ($distname,$version);
     if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
         $distname = $1;
@@ -3212,11 +3214,39 @@ sub copy_apache2_debconf {
                 close(PIPE);
                 chomp($diffres);
                 if ($diffres) {
-                    copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");
+                    copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.conf.original");
+                } else {
+                    copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.conf");
+                    chdir($apache2_conf_enabled_dir);
+                    symlink('../conf-available/loncapa.conf','loncapa.conf');
+                    chdir($instdir);
                 }
                 if (-l $defaultconf) {
                     my $linkfname = readlink($defaultconf);
+                    if ($linkfname ne '') {
+                        $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_conf_enabled_dir));
+                    }
                     if ($linkfname eq "$apache2_conf_available_dir/loncapa") {
+                        unlink($defaultconf);
+                    }
+                }
+                unlink("$apache2_conf_available_dir/loncapa");
+            }
+        }
+        if ((-e "$apache2_conf_available_dir/loncapa.conf") && (-e "$instdir/debian-ubuntu/ubuntu14/loncapa_conf")) {
+            if (open(PIPE, "diff --brief $apache2_conf_available_dir/loncapa.conf $instdir/debian-ubuntu/ubuntu14/loncapa_conf |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                if ($diffres) {
+                    copy("$apache2_conf_available_dir/loncapa.conf","$apache2_conf_available_dir/loncapa.conf.original");
+                }
+                if (-l $defaultconf) {
+                    my $linkfname = readlink($defaultconf);
+                    if ($linkfname ne '') {
+                        $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_conf_enabled_dir));
+                    }
+                    if ($linkfname eq "$apache2_conf_available_dir/loncapa.conf") {
                         unless ($diffres) {
                             $skipconf = 1;
                         }
@@ -3226,12 +3256,14 @@ sub copy_apache2_debconf {
         }
         unless ($skipconf) {
             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");
-            copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa");
-            chmod(0444,"$apache2_conf_available_dir/loncapa");
+            copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa.conf");
+            chmod(0444,"$apache2_conf_available_dir/loncapa.conf");
             if (-l $defaultconf) {
                 unlink($defaultconf);
             }
-            symlink("$apache2_conf_available_dir/loncapa","$defaultconf");
+            chdir($apache2_conf_enabled_dir);
+            symlink('../conf-available/loncapa.conf','loncapa.conf');
+            chdir($instdir);
         }
         my $stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_site";
         if ((-e $stdsite) && (-e "$apache2_sites_available_dir/loncapa")) {
@@ -3240,11 +3272,36 @@ sub copy_apache2_debconf {
                 close(PIPE);
                 chomp($diffres);
                 if ($diffres) {
-                    copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
+                    copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.conf.original");
+                } else {
+                    copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.conf");
                 }
                 if (-l $defaultconfig) {
                     my $linkfname = readlink($defaultconfig);
+                    if ($linkfname ne '') {
+                        $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_sites_enabled_dir));
+                    }
                     if ($linkfname eq "$apache2_sites_available_dir/loncapa") {
+                        unlink($defaultconfig);
+                    }
+                }
+                unlink("$apache2_sites_available_dir/loncapa");
+            }
+        }
+        if ((-e $stdsite) && (-e "$apache2_sites_available_dir/loncapa.conf")) {
+            if (open(PIPE, "diff --brief $stdsite $apache2_sites_available_dir/loncapa.conf |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                if ($diffres) {
+                    copy("$apache2_sites_available_dir/loncapa.conf","$apache2_sites_available_dir/loncapa.conf.original");
+                }
+                if (-l $defaultsite) {
+                    my $linkfname = readlink($defaultsite);
+                    if ($linkfname ne '') {
+                        $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_sites_enabled_dir));
+                    }
+                    if ($linkfname eq "$apache2_sites_available_dir/loncapa.conf") {
                         unless ($diffres) {
                             $skipsite = 1;
                         }
@@ -3253,10 +3310,21 @@ sub copy_apache2_debconf {
             }
         }
         unless ($skipsite) {
-            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");
+            print_and_log(&mt('Copying loncapa [_1] site file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'loncapa.conf symlink'")."\n");
+            copy("$instdir/debian-ubuntu/ubuntu14/loncapa_site","$apache2_sites_available_dir/loncapa.conf");
+            chmod(0444,"$apache2_sites_available_dir/loncapa.conf");
+            chdir($apache2_sites_enabled_dir);
+            symlink('../sites-available/loncapa.conf','loncapa.conf');
+            chdir($instdir);
+        }
+        if (-l $defaultconfig) {
+            my $linkfname = readlink($defaultconfig);
+            if ($linkfname ne '') {
+                $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,$apache2_sites_enabled_dir));
+            }
+            if ($linkfname eq "$apache2_sites_available_dir/000-default.conf") {
+                unlink($defaultconfig);
+            }
         }
     } else {
         if ((-e "$instdir/debian-ubuntu/loncapa") && (-e "$apache2_sites_available_dir/loncapa")) {