Add upgrading postgresql to 8.3.

Add a few chapters top root
Edit docbook conversion script to point to github working directory.

diff --git a/1.6/admin/Upgrading-Evergreen_1.6.xml b/1.6/admin/Upgrading-Evergreen_1.6.xml
index aa7807e..f24bfcb 100644 (file)
--- a/1.6/admin/Upgrading-Evergreen_1.6.xml
+++ b/1.6/admin/Upgrading-Evergreen_1.6.xml
@@ -259,8 +259,8 @@
                        </step> \r
                </procedure>    \r
        </simplesect>\r
-       <simplesect>\r
-               <para>Restart Evergreen and Test</para>\r
+       <simplesect xml:id="upgraderestart">\r
+               <title>Restart Evergreen and Test</title>\r
                <procedure>\r
                        <step>\r
                                <para>As the <emphasis>opensrf</emphasis> user, start all \r
@@ -291,4 +291,50 @@
                section</link> of this documentation for tips \r
                on finding solutions and seeking further assistance from the Evergreen community.</para>  \r
        </note>\r
+<simplesect>\r
+               <title>Upgrading PostgreSQL from 8.2 to 8.3</title>\r
+               <para>Evergreen 1.6 supports PostgreSQL version 8.3 and it is recommended that you upgrade PostgreSQL when you upgrade Evergreen to 1.6.</para>\r
+               <note><para>The Order of the following steps is very important.</para></note>\r
+               <procedure>\r
+                       <step>\r
+                               <para>As opensrf, stop the evergreen and opensrf services:</para>\r
+                               <screen>osrf_ctl.sh -l -a stop_all</screen>\r
+                       </step>                 \r
+                       <step>\r
+                               <para><link linkend="backupevergreendatabase">Backup the Evergreen database data</link></para>\r
+                       </step>\r
+                       <step>                  \r
+                               <para>Create an empty Evergreen database in postgresql 8.3 by issuing the following commands as the postgres user:</para>\r
+                               <screen>createdb -E UNICODE evergreen</screen>\r
+                               <screen>createlang plperl   evergreen</screen>\r
+                               <screen>createlang plperlu  evergreen</screen>\r
+                               <screen>createlang plpgsql  evergreen</screen>\r
+                               <screen>psql -f /usr/share/postgresql/8.3/contrib/tablefunc.sql evergreen</screen>\r
+                               <screen>psql -f /usr/share/postgresql/8.3/contrib/tsearch2.sql evergreen</screen>\r
+                               <screen>psql -f /usr/share/postgresql/8.3/contrib/pgxml.sql evergreen</screen>          \r
+                       </step>\r
+                       <step>\r
+                               <para>As the postgres user on the PostgreSQL server, create a PostgreSQL user named evergreen for the database cluster:</para>\r
+                               <screen>createuser -P -s evergreen</screen>\r
+                               <para>Enter the password for the new PostgreSQL superuser (<quote>evergreen</quote>)</para>     \r
+                       </step>                 \r
+                       <step>\r
+                               <para>Restore data from backup created in step 1.</para>\r
+                       </step>\r
+                       <step>\r
+                               <para>To point tsearch2 to proper function names in 8.3, run the SQL script \r
+                               <filename>/home/opensrf/Evergreen-ILS*/Open-ILS/src/sql/Pg/000.english.pg83.fts-config.sql</filename> using the <command>psql</command> command.</para>\r
+                       </step>\r
+                       <step>\r
+                               <para><link linkend="upgraderestart">Restart Evergreen and OpenSRF services</link></para>\r
+                       </step>\r
+                       <step>\r
+                               <para>For additional information regarding upgrading PostgreSQL, see the following documentation in PostgreSQL:</para>\r
+                               <para><ulink url="http://www.postgresql.org/docs/8.3/static/install-upgrading.html" /></para>\r
+                               <para><ulink url="http://www.postgresql.org/docs/8.3/interactive/textsearch-migration.html" /> \r
+                               </para>\r
+                               <para><ulink url="http://www.postgresql.org/docs/current/static/tsearch2.html#AEN102824" /></para>\r
+                       </step>\r
+               </procedure>\r
+       </simplesect>\r
 </chapter>\r

diff --git a/1.6/appendices/temp.xml b/1.6/appendices/temp.xml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/1.6/root.xml b/1.6/root.xml
index 638207e..59cee76 100755 (executable)
--- a/1.6/root.xml
+++ b/1.6/root.xml
@@ -68,9 +68,12 @@
                </info>\r
                <xi:include href="admin/admin-intro.xml"/>\r
                <xi:include href="admin/requirements-configuration.xml"/>\r
+               <xi:include href="admin/ServersideInstallation.xml"/>   \r
                <xi:include href="admin/serveradministration.xml"/>\r
                <xi:include href="admin/AdminMisc.xml"/>\r
                <xi:include href="admin/admin-lsa.xml"/>\r
+               <xi:include href="admin/admin-survey.xml"/>\r
+               <xi:include href="admin/admin-receipt.xml"/>\r
                <xi:include href="admin/Upgrading-Evergreen_1.6.xml"/>\r
                <xi:include href="admin/troubleshooting.xml"/>\r
                <xi:include href="admin/z3950.xml"/>\r

diff --git a/tools/docbookConvert.sh b/tools/docbookConvert.sh
index 51b5f91..0553ff0 100755 (executable)
--- a/tools/docbookConvert.sh
+++ b/tools/docbookConvert.sh
@@ -1,14 +1,14 @@
 #/bin/bash
 
 #generate draft html
- xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/draft/html/ /home/rsoulliere/doctools/EvergreenDocumentation/evergreen_docbook_files/evergreen_xhtml.xsl /home/rsoulliere/doctools/EvergreenDocumentation/root.xml
+ xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml
 
 
 #Generate PDF via FO
-xsltproc --xinclude  --output /home/rsoulliere/doctools/EvergreenDocumentation/pdf/temp.fo /home/rsoulliere/doctools/EvergreenDocumentation/evergreen_docbook_files/evergreen_fo.xsl /home/rsoulliere/doctools/EvergreenDocumentation/root.xml
+ xsltproc --xinclude  --output ~/Evergreen-DocBook/1.6/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/1.6/root.xml
 
 # must run fop from same directory as root.xml
-cd /home/rsoulliere/doctools/EvergreenDocumentation/
+cd ~/Evergreen-DocBook/1.6/
 
  ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/draft/pdf/Evergreen_Documentation.pdf