Bug 11190: sitemap.pl -- Generate a Catalog sitemap

[srvgit] / about.pl

diff --git a/about.pl b/about.pl
index 34c98ef..29777cf 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -34,6 +34,7 @@ use C4::Context;
 use C4::Installer;
 
 use Koha;
+use Koha::Config::SysPrefs;
 
 #use Smart::Comments '####';
 
@@ -57,9 +58,10 @@ if ($^O ne 'VMS') {
 }
 my $perlVersion   = $];
 my $mysqlVersion  = `mysql -V`;
-my $apacheVersion = `httpd -v 2> /dev/null`;
-$apacheVersion = `httpd2 -v 2> /dev/null` unless $apacheVersion;
-$apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;
+# Get Apache version
+my $apacheVersion = (`apache2ctl -v`)[0];
+$apacheVersion    = `httpd2 -v 2> /dev/null` unless $apacheVersion;
+$apacheVersion    = `httpd -v 2> /dev/null` unless $apacheVersion;
 my $zebraVersion = `zebraidx -V`;
 
 # Additional system information for warnings
@@ -150,6 +152,25 @@ if ( (C4::Context->config('zebra_auth_index_mode') eq 'grs1') && ($context->{'se
     };
 }
 
+if ( ! defined C4::Context->config('log4perl_conf') ) {
+    push @xml_config_warnings, {
+        error => 'log4perl_entry_missing'
+    }
+}
+
+if ( ! defined C4::Context->config('upload_path') ) {
+    if ( Koha::Config::SysPrefs->find('OPACBaseURL')->value ) {
+        # OPACBaseURL seems to be set
+        push @xml_config_warnings, {
+            error => 'uploadpath_entry_missing'
+        }
+    } else {
+        push @xml_config_warnings, {
+            error => 'uploadpath_and_opacbaseurl_entry_missing'
+        }
+    }
+}
+
 # Test QueryParser configuration sanity
 if ( C4::Context->preference( 'UseQueryParser' ) ) {
     # Get the QueryParser configuration file name