From 08974269244aee90141eb7220c3c9927b437f3c1 Mon Sep 17 00:00:00 2001
From: Steve Sheppard <ssheps@gmail.com>
Date: Mon, 13 Sep 2010 11:37:00 -0400
Subject: [PATCH] replace image in section "Testing with settings-tester.pl"
 with <programlisting/> tags and real text;

---
 1.6/admin/ServersideInstallation.xml | 113 +++++++++++++++++++++------
 1 file changed, 90 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 1.6/admin/ServersideInstallation.xml

diff --git a/1.6/admin/ServersideInstallation.xml b/1.6/admin/ServersideInstallation.xml
old mode 100644
new mode 100755
index ac1e5ce754..ed458849e2
--- a/1.6/admin/ServersideInstallation.xml
+++ b/1.6/admin/ServersideInstallation.xml
@@ -161,7 +161,7 @@
 			</section>
 			<section>
 				<title>Configure OpenSRF</title>
-				<para>As the <systemitem class="username">opensrf</systemitem> user, return to the OpenSRF build directory and use the <command>configure</command> utility to prepare for the next step of compiling and linking the software. You can include the  <option>--enable-python</option> and <option>--enable-java</option> configuration options if you wish to include support for Python and Java, respectively:</para>
+				<para>As the <systemitem class="username">opensrf</systemitem> user, return to the OpenSRF build directory and use the <command>configure</command> utility to prepare for the next step of compiling and linking the software. You can include the <option>--enable-python</option> and <option>--enable-java</option> configuration options if you wish to include support for Python and Java, respectively:</para>
 				<figure>
 					<title>Commands to configure OpenSRF</title>
 					<screen>
@@ -369,7 +369,8 @@ $ ejabberdctl register opensrf public.localhost  <password>
 <logfile>/tmp/srfsh.log</logfile>
 <!-- 0 None, 1 Error, 2 Warning, 3 Info, 4 debug, 5 Internal (Nasty) -->
 <loglevel>4</loglevel>
-</srfsh>]]></programlisting>
+</srfsh>
+]]></programlisting>
 				</figure>
 			</section>
 			<section>
@@ -856,8 +857,10 @@ $ ejabberdctl register opensrf public.localhost  <password>
 				<para>Some further configuration changes to Apache may be necessary for busy systems. These changes increase the number of Apache server processes that are started to support additional browser connections.</para>
 				<procedure>
 					<step>As the <systemitem class="username">root</systemitem> user, edit the Apache configuration file <filename>/etc/apache2/apache2.conf</filename>, locate and modify the section related to <emphasis>prefork configuration</emphasis> to suit the load on your system.</step>
-					<step>As the <systemitem class="username">root</systemitem> user, edit the Apache configuration file <filename>/etc/apache2/apache2.conf</filename> and add the line <emphasis role="bold">MaxKeepAliveRequests 100</emphasis>, or modify an existing line if it already exists.
-						<figure><title>(OPTIONAL) Example of updates to Apache configuration</title><programlisting language="xml"><![CDATA[
+					<step><para>As the <systemitem class="username">root</systemitem> user, edit the Apache configuration file <filename>/etc/apache2/apache2.conf</filename> and add the line <emphasis role="bold">MaxKeepAliveRequests 100</emphasis>, or modify an existing line if it already exists.</para>
+						<figure>
+							<title>(OPTIONAL) Example of updates to Apache configuration</title>
+							<programlisting language="xml"><![CDATA[
 <IfModule mpm_prefork_module>
    StartServers		  20
    MinSpareServers	   5
@@ -866,7 +869,9 @@ $ ejabberdctl register opensrf public.localhost  <password>
    MaxRequestsPerChild 10000
 </IfModule>
 MaxKeepAliveRequests 100
-]]></programlisting></figure></step>
+							]]></programlisting>
+							</figure>
+					</step>
 				</procedure>
 			</section>
 			<section>
@@ -1120,24 +1125,86 @@ MaxKeepAliveRequests 100
 				<section>
 					<title>Testing with <application>settings-tester.pl</application></title>
 					<para>As the <systemitem class="username">opensrf</systemitem> user, run the script <command>settings-tester.pl</command> to see if it finds any system configuration problems. Following is sample output generated by executing that script after a successful Evergreen installation:</para>
-					<indexterm>
-						<primary>ZZZ-REVIEW</primary>
-						<secondary>REWORK THIS DIAGRAM TO USE SAME IMAGE STANDARDS AS OTHER CHAPTERS </secondary>
-					</indexterm>
-					<caution>REWORK THIS DIAGRAM TO USE SAME IMAGE STANDARDS AS OTHER CHAPTERS </caution>
-					<figure>
-						<title>Executing the script <command>settings-tester.pl</command></title>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="../media/serversideinstallation-testing-1.png" scalefit="1" width="100%"/>
-							</imageobject>
-						</mediaobject>
-						<mediaobject>
-							<imageobject>
-								<imagedata fileref="../media/serversideinstallation-testing-2.png" scalefit="1" width="100%"/>
-							</imageobject>
-						</mediaobject>
-					</figure>
+					<section>
+						<title>Example of execution of <command>settings-tester.pl</command></title>
+						<programlisting language="xml"><![CDATA[
+						$ su - root
+						$ cd /home/opensrf/Evergreen-ILS-1.6.0.0
+						$ perl Open-ILS/src/support-scripts/settings-tester.pl
+						LWP::UserAgent version 5.810
+						XML::LibXML version 1.70
+						XML::LibXML::XPathContext version 1.70
+						XML::LibXSLT version 1.70
+						Net::Server::PreFork version 0.97
+						Cache::Memcached version 1.24
+						Class::DBI version 0.96
+						Class::DBI::AbstractSearch version 0.07
+						Template version 2.19
+						DBD::Pg version 2.8.2
+						Net::Z3950::ZOOM version 1.24
+						MARC::Record version 2.0.0
+						MARC::Charset version 1.1
+						MARC::File::XML version 0.92
+						Text::Aspell version 0.04
+						CGI version 3.29
+						DateTime::TimeZone version 0.7701
+						DateTime version 0.42
+						DateTime::Format::ISO8601 version 0.06
+						DateTime::Format::Mail version 0.3001
+						Unix::Syslog version 1.1
+						GD::Graph3d version 0.63
+						JavaScript::SpiderMonkey version 0.19
+						Log::Log4perl version 1.16
+						Email::Send version 2.192
+						Text::CSV version 1.06
+						Text::CSV_XS version 0.52
+						Spreadsheet::WriteExcel::Big version 2.20
+						Tie::IxHash version 1.21
+						Parse::RecDescent version 1.95.1
+						SRU version 0.99
+						JSON::XS version 2.27
+
+						Checking Jabber connection for user opensrf, domain private.localhost
+						* Jabber successfully connected
+						
+						Checking Jabber connection for user opensrf, domain public.localhost
+						* Jabber successfully connected
+						
+						Checking Jabber connection for user router, domain public.localhost
+						* Jabber successfully connected
+						
+						Checking Jabber connection for user router, domain private.localhost
+						* Jabber successfully connected
+						]]></programlisting>
+						<programlisting language="xml"><![CDATA[
+						Checking database connections
+						* /opensrf/default/reporter/setup :: Successfully connected to database dbi:Pg:dbname=evergreen;host=localhost;port=5432
+						  * Database has the expected server encoding UTF8.
+						* /opensrf/default/apps/open-ils.storage/app_settings/databases :: Successfully connected to database dbi:Pg:dbname=evergreen;host=localhost;port=5432
+						  * Database has the expected server encoding UTF8.
+						* /opensrf/default/apps/open-ils.cstore/app_settings :: Successfully connected to database dbi:Pg:dbname=evergreen;host=localhost;port=5432
+						  * Database has the expected server encoding UTF8.
+						* /opensrf/default/apps/open-ils.pcrud/app_settings :: Successfully connected to database dbi:Pg:dbname=evergreen;host=localhost;port=5432
+						  * Database has the expected server encoding UTF8.
+						* /opensrf/default/apps/open-ils.reporter-store/app_settings :: Successfully connected to database dbi:Pg:dbname=evergreen;host=localhost;port=5432
+						  * Database has the expected server encoding UTF8.
+						
+						Checking database drivers to ensure <driver> matches <language>
+						* OK: Pg language is undefined for reporter base configuration
+						* OK: Pg language is undefined for reporter base configuration
+						* OK: Pg language is perl in /opensrf/default/apps/open-ils.storage/language
+						* OK: pgsql language is C in /opensrf/default/apps/open-ils.cstore/language
+						* OK: pgsql language is C in /opensrf/default/apps/open-ils.pcrud/language
+						* OK: pgsql language is C in /opensrf/default/apps/open-ils.reporter-store/language
+						
+						Checking libdbi and libdbi-drivers
+						  * OK - found locally installed libdbi.so and libdbdpgsql.so in shared library path
+						
+						Checking hostname
+						 * OK: found hostname 'localhost' in <hosts> section of opensrf.xml
+						$
+						]]></programlisting>
+					</section>
 					<para>If the output from the script does not help you find the problem, please do not make any further significant changes to your configuration. Follow the steps in the troubleshooting guide in <xref linkend="troubleshooting"/>.</para>
 					<para>If you have followed the entire set of installation steps listed here closely, you are probably extremely close to a working system. Gather your configuration files and log files and contact the <ulink url="http://open-ils.org/listserv.php">Evergreen development mailing list</ulink> for assistance before making any drastic changes to your system configuration.</para>
 				</section>
-- 
2.43.2