--- doc/install/linux/install.pl	2011/03/28 13:27:56	1.6
+++ doc/install/linux/install.pl	2011/04/24 22:44:50	1.10
@@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.6 2011/03/28 13:27:56 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.10 2011/04/24 22:44:50 raeburn Exp $'."\n";
 }
 
 #
@@ -293,7 +293,7 @@ sub check_prerequisites {
             } else {
                 my $line = <PIPE>;
                 chomp($line);
-                if ($line =~ /^LONCAPA-prerequisites\-([\d\-]+)\.(\w+)$/) {
+                if ($line =~ /^LONCAPA\-prerequisites\-([\d\-]+)\.(?:[.\w]+)$/) {
                     $gotprereqs = $1;
                 }
             }
@@ -307,12 +307,19 @@ sub check_prerequisites {
 
 sub check_locale {
     my ($distro) = @_;
-    my ($fh,$command);
+    my ($fh,$langvar,$command);
+    $langvar = 'LANG';
     if ($distro =~ /^(ubuntu|debian)/) {
         if (!open($fh,"</etc/default/locale")) {
             print &mt('Failed to open: [_1], default locale not checked.',
                       '/etc/default/locale');
         }
+    } elsif ($distro =~ /^(suse|sles)/) {
+        if (!open($fh,"</etc/sysconfig/language")) {
+            print &mt('Failed to open: [_1], default locale not checked.',
+                      '/etc/sysconfig/language');
+        }
+        $langvar = 'RC_LANG';
     } else {
         if (!open($fh,"</etc/sysconfig/i18n")) {
             print &mt('Failed to open: [_1], default locale not checked.',
@@ -322,13 +329,15 @@ sub check_locale {
     my @data = <$fh>;
     chomp(@data);
     foreach my $item (@data) {
-        if ($item =~ /^LANG=\"([^\"]*)\"/) {
+        if ($item =~ /^\Q$langvar\E=\"([^\"]*)\"/) {
             my $default = $1;
             if ($default ne 'en_US.UTF-8') {
                 if ($distro =~ /^debian/) {
                     $command = 'dpkg-reconfigure locales';
                 } elsif ($distro =~ /^ubuntu/) {
                     $command = 'sudo set-language-env -E'; 
+                } elsif ($distro =~ /^(suse|sles)/) {
+                    $command = 'yast language'; 
                 } else {
                     $command = 'system-config-language';
                 }
@@ -384,7 +393,7 @@ sub check_required {
         }
     }
     ($recommended{'firewall'},$apachefw) = &chkfirewall($distro);
-    ($recommended{'runlevels'},$tostop) = &chkconfig($distro);
+    ($recommended{'runlevels'},$tostop) = &chkconfig($distro,$instdir);
     $recommended{'apache'} = &chkapache($distro,$instdir);
     $recommended{'stopsrvcs'} = &chksrvcs($distro,$tostop);
     ($recommended{'download'},$downloadstatus,$filetouse,$production,$testing) 
@@ -440,7 +449,7 @@ sub check_mysql_running {
 }
 
 sub chkconfig {
-    my ($distro) = @_;
+    my ($distro,$instdir) = @_;
     my (%needfix,%tostop);
     my $checker_bin = '/sbin/chkconfig';
     my %daemon = (
@@ -457,6 +466,7 @@ sub chkconfig {
         @norunlevels = qw/0 2 1 6/;
         $daemon{'mysql'} = 'mysql';
         $daemon{'apache'} = 'apache2';
+        $daemon{'ntp'}    = 'ntp';
         if ($distro =~ /^(suse|sles)9/) {
             $daemon{'apache'} = 'apache';
         }
@@ -532,7 +542,9 @@ sub chkconfig {
             $major = $version;
         }
         if ($major > 10) {
-            $needfix{'insserv'} = &check_SuSEfirewall2_setup();
+            if (&check_SuSEfirewall2_setup($instdir)) {
+                $needfix{'insserv'} = 1;
+            }
         }
     }
     return (\%needfix,\%tostop);
@@ -578,11 +590,11 @@ sub chkapache {
     my ($distro,$instdir) = @_;
     my $fixapache = 1;
     if ($distro =~ /^(debian|ubuntu)/) {
-        if (!-e "$instdir/apache2.conf") {
+        if (!-e "$instdir/debian-ubuntu/apache2.conf") {
             $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/apache2.conf")) {
-            if (open(PIPE, "diff --brief $instdir/apache2.conf /etc/apache2/sites-available/loncapa |")) {
+        } 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 |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -601,13 +613,27 @@ sub chkapache {
     } elsif ($distro =~ /^(?:suse|sles)([\d\.]+)$/) {
         my $apache = 'apache';
         if ($1 >= 10) {
-            my $apache = 'apache2';
+            $apache = 'apache2';
+        }
+        if (!-e "$instdir/sles-suse/default-server.conf") {
+            $fixapache = 0;
+            print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n";
+        } elsif ((-e "/etc/$apache/default-server.conf") && (-e "$instdir/sles-suse/default-server.conf")) {
+            if (open(PIPE, "diff --brief $instdir/sles-suse/default-server.conf /etc/$apache/default-server.conf |")) {
+                my $diffres = <PIPE>;
+                close(PIPE);
+                chomp($diffres);
+                unless ($diffres) {
+                    $fixapache = 0;
+                }
+            }
         }
-        if (!-e "$instdir/default-server.conf") {
+    } elsif ($distro eq 'rhes4') {
+        if (!-e "$instdir/rhes4/httpd.conf") {
             $fixapache = 0;
             print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n";
-        } elsif ((-e "/etc/$apache/default-server.conf") && (-e "$instdir/default-server.conf")) {
-            if (open(PIPE, "diff --brief $instdir/default-server.conf /etc/$apache/default-server.conf |")) {
+        } elsif ((-e "/etc/httpd/conf/httpd.conf") && (-e "$instdir/rhes4/httpd.conf")) {
+            if (open(PIPE, "diff --brief $instdir/rhes4/httpd.conf /etc/httpd/conf/httpd.conf |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -617,11 +643,11 @@ sub chkapache {
             }
         }
     } else {
-        if (!-e "$instdir/httpd.conf") {
+        if (!-e "$instdir/centos-rhes-fedora-sl/httpd.conf") {
             $fixapache = 0;
             print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n";
-        } elsif ((-e "/etc/httpd/conf/httpd.conf") && (-e "$instdir/httpd.conf")) {
-            if (open(PIPE, "diff --brief $instdir/httpd.conf /etc/httpd/conf/httpd.conf |")) {
+        } elsif ((-e "/etc/httpd/conf/httpd.conf") && (-e "$instdir/centos-rhes-fedora-sl/httpd.conf")) {
+            if (open(PIPE, "diff --brief $instdir/centos-rhes-fedora-sl/httpd.conf /etc/httpd/conf/httpd.conf |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -652,10 +678,16 @@ sub chksrvcs {
             chomp($daemonrunning);
             close(PIPE);
             if ($daemonrunning) {
-                $stopsrvcs{$service} = 1;
+                if ($service eq 'memcached') { 
+                    unless ($daemonrunning =~ m{^www[^/]+\Q/usr/sbin/memcached -m 400 -v\E$}) {
+                        $stopsrvcs{$service} = 1;
+                    }
+                } else {
+                    $stopsrvcs{$service} = 1;
+                }
             }
         }
-    } 
+    }
     return \%stopsrvcs;
 }
 
@@ -928,8 +960,8 @@ sub get_mysql_password {
 sub check_SuSEfirewall2_setup {
     my ($instdir) = @_;
     my $need_override = 1;
-    if ((-e "/etc/insserv/overrides/SuSEfirewall2_setup") && (-e "$instdir/SuSEfirewall2_setup")) {
-        if (open(PIPE, "diff --brief $instdir/SuSEfirewall2_setup /etc/insserv/overrides/SuSEfirewall2_setup  |")) {
+    if ((-e "/etc/insserv/overrides/SuSEfirewall2_setup") && (-e "$instdir/sles-suse/SuSEfirewall2_setup")) {
+        if (open(PIPE, "diff --brief $instdir/sles-suse/SuSEfirewall2_setup /etc/insserv/overrides/SuSEfirewall2_setup  |")) {
             my $diffres = <PIPE>;
             close(PIPE);
             chomp($diffres);
@@ -1270,7 +1302,7 @@ if ($callsub{'firewall'}) {
 if ($callsub{'stopsrvcs'}) {
     &kill_extra_services($distro,$recommended->{'stopsrvcs'});
 } else {
-    &print_and_log(&mt('Skipping stopping unnecessary service ([_1] daemon).',"'cups'")."\n");
+    &print_and_log(&mt('Skipping stopping unnecessary service ([_1] daemons).',"'cups','memcached'")."\n");
 }
 
 my ($have_tarball,$updateshown);
@@ -1472,6 +1504,8 @@ sub kill_extra_services {
                             if (($distro =~ /^ubuntu/) && ($version <= 8)) {
                                 $daemon = 'cupsys';
                             }
+                        } elsif ($distro =~ /^(?:suse|sles)/) {
+                            $daemon = 'cups';
                         }
                     }
 	            &print_and_log(`/etc/init.d/$daemon stop`);
@@ -1653,7 +1687,7 @@ sub copy_apache2_debconf {
     if (-e "$apache2_sites_available_dir/loncapa") {
         copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
     }
-    copy("$instdir/apache2.conf","$apache2_sites_available_dir/loncapa");
+    copy("$instdir/debian-ubuntu/apache2.conf","$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';
@@ -1683,7 +1717,7 @@ sub copy_apache2_suseconf {
     if (!-e "/etc/apache2/default-server.conf.original") {
         copy "/etc/apache2/default-server.conf","/etc/apache2/default-server.conf.original";
     }
-    copy "$instdir/default-server.conf","/etc/apache2/default-server.conf";
+    copy "$instdir/sles-suse/default-server.conf","/etc/apache2/default-server.conf";
     chmod(0444,"/etc/apache2/default-server.conf");
     # Make symlink for conf directory (included in loncapa_apache.conf)
     my $can_symlink = (eval { symlink('/etc/apache2','/srv/www/conf'); }, $@ eq '');
@@ -1710,7 +1744,7 @@ sub copy_apache2_conf_files {
     if (!-e "/etc/apache2/uid.conf.original") {
         copy "/etc/apache2/uid.conf","/etc/apache2/uid.conf.original";
     }
-    copy "$instdir/uid.conf","/etc/apache2/uid.conf";
+    copy "$instdir/sles-suse/uid.conf","/etc/apache2/uid.conf";
     chmod(0444,"/etc/apache2/uid.conf");
 }
 
@@ -1725,7 +1759,7 @@ sub copy_sysconfig_apache2_file {
     if (!-e "/etc/sysconfig/apache2.original") {
         copy "/etc/sysconfig/apache2","/etc/sysconfig/apache2.original";
     }
-    copy "$instdir/sysconfig_apache2","/etc/sysconfig/apache2";
+    copy "$instdir/sles-suse/sysconfig_apache2","/etc/sysconfig/apache2";
     chmod(0444,"/etc/sysconfig/apache2");
 }
 
@@ -1748,7 +1782,7 @@ sub update_SuSEfirewall2_setup {
     } elsif (!-e  "/etc/insserv/overrides/SuSEfirewall2_setup.original") {
         copy "/etc/insserv/overrides/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup.original"
     }
-    copy "$instdir/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup";
+    copy "$instdir/sles-suse/SuSEfirewall2_setup","/etc/insserv/overrides/SuSEfirewall2_setup";
     chmod(0444,"/etc/insserv/overrides/SuSEfirewall2_setup");
 }
 
@@ -1775,7 +1809,7 @@ sub get_iptables_rules {
     }
     my $ask_to_enable;
     if (-e "/etc/iptables.loncapa.rules") {
-        if (open(PIPE, "diff --brief $instdir/debian/iptables.loncapa.rules /etc/iptables.loncapa.rules |")) {
+        if (open(PIPE, "diff --brief $instdir/debian-ubuntu/iptables.loncapa.rules /etc/iptables.loncapa.rules |")) {
             my $diffres = <PIPE>;
             close(PIPE);
             chomp($diffres);
@@ -1786,14 +1820,14 @@ sub get_iptables_rules {
             print &mt('Error: unable to open [_1] to compare contents with LON-CAPA supplied file.','/etc/iptables.loncapa.rules')."\n";
         }
     } else {
-        if (-e "$instdir/debian/iptables.loncapa.rules") {
-            copy "$instdir/debian/iptables.loncapa.rules","/etc/iptables.loncapa.rules";
+        if (-e "$instdir/debian-ubuntu/iptables.loncapa.rules") {
+            copy "$instdir/debian-ubuntu/iptables.loncapa.rules","/etc/iptables.loncapa.rules";
             chmod(0600,"/etc/iptables.loncapa.rules");
         }
     }
     if (-e "/etc/iptables.loncapa.rules") {
         if (-e "/etc/network/if-pre-up.d/iptables") {
-            if (open(PIPE, "diff --brief $instdir/debian/iptables /etc/network/if-pre-up/iptables |")) {
+            if (open(PIPE, "diff --brief $instdir/debian-ubuntu/iptables /etc/network/if-pre-up/iptables |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -1804,7 +1838,7 @@ sub get_iptables_rules {
                 print &mt('Error: unable to open [_1] to compare contents with LON-CAPA supplied file.','/etc/network/if-pre-up.d/iptables')."\n";
             }
         } else {
-            copy "$instdir/debian/iptables","/etc/network/if-pre-up.d/iptables";
+            copy "$instdir/debian-ubuntu/iptables","/etc/network/if-pre-up.d/iptables";
             chmod(0755,"/etc/network/if-pre-up.d/iptables");
             print_and_log(&mt('Installed script "[_1]" to add iptables rules to block all ports except 22, 80, and 443 when network is enabled during boot.','/etc/network/if-pre-up.d/iptables'));
             $ask_to_enable = 1;