Update Opensrf upgrade instructions based on: http://evergreen-ils.org/dokuwiki/doku...

diff --git a/2.0/admin/Upgrading-Evergreen-2.0.xml b/2.0/admin/Upgrading-Evergreen-2.0.xml
index af6c499..793476e 100644 (file)
--- a/2.0/admin/Upgrading-Evergreen-2.0.xml
+++ b/2.0/admin/Upgrading-Evergreen-2.0.xml
@@ -52,16 +52,16 @@
                </procedure>\r
        </section>\r
        <section xml:id="upgradingevergreen-upgradingOpenSRF">\r
-               <title>Upgrading OpenSRF to 1.6.3</title><indexterm><primary>OpenSRF</primary></indexterm>\r
+               <title>Upgrading OpenSRF to 2.0</title><indexterm><primary>OpenSRF</primary></indexterm>\r
                <procedure>\r
                        <step>\r
                                <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract the source files for <application>OpenSRF</application> \r
-                               1.6.3:</para>\r
+                               2.0:</para>\r
 <screen><userinput>\r
-wget http://open-ils.org/downloads/opensrf-1.6.3.tar.gz\r
+wget http://open-ils.org/downloads/opensrf-2.0.0.tar.gz\r
 tar xzf opensrf-1.6.3.tar.gz\r
 </userinput></screen>\r
-                               <para>A new directory opensrf-1.6.3 is created.</para>\r
+                               <para>A new directory opensrf-2.0.0 is created.</para>\r
                                <note><para>For the latest edition of OpenSRF, check the Evergreen download page at \r
                                <ulink url="http://www.open-ils.org/downloads.php" />.\r
                                </para></note>\r
@@ -71,7 +71,7 @@ tar xzf opensrf-1.6.3.tar.gz
                                prerequisite installer.</para> \r
 <screen><userinput>\r
 aptitude install make\r
-cd /home/opensrf/opensrf-1.6.3\r
+cd /home/opensrf/opensrf-2.0.0\r
 </userinput></screen>          \r
                                <para>Replace <option>[distribution]</option> below with the following value \r
                                for your distribution:</para>\r
@@ -98,7 +98,6 @@ cd /home/opensrf/opensrf-1.6.3
                                        </listitem>\r
                                </itemizedlist>\r
 <screen><userinput>\r
-cd /path/to/OpenSRF\r
 make -f src/extras/Makefile.install [distribution]\r
 </userinput></screen>\r
                                <para>This will install a number of packages required by OpenSRF on your system, \r
@@ -114,7 +113,7 @@ make -f src/extras/Makefile.install [distribution]
                                you want to include support for Python<indexterm><primary>Python</primary></indexterm> and Java\r
                                <indexterm><primary>Java</primary></indexterm>, respectively.</note>\r
 <screen><userinput>\r
-cd /home/opensrf/opensrf-1.6.3\r
+cd /home/opensrf/opensrf-2.0.0\r
 ./configure --prefix=/openils --sysconfdir=/openils/conf\r
 make\r
 </userinput></screen>          \r
@@ -123,7 +122,7 @@ make
                                <para>As the <systemitem class="username">root</systemitem> user, return to your OpenSRF build directory and install \r
                                OpenSRF:</para>\r
 <screen><userinput>\r
-cd /home/opensrf/opensrf-1.6.3\r
+cd /home/opensrf/opensrf-2.0.0\r
 make install\r
 </userinput></screen>\r
                        </step>\r
@@ -131,6 +130,32 @@ make install
                                <para>As the <systemitem class="username">root</systemitem> user, change the ownership of the installed files to the \r
                                <systemitem class="username">opensrf</systemitem> user:</para>\r
                                <screen><userinput>chown -R opensrf:opensrf /openils</userinput></screen>\r
+                       </step>                 \r
+                       <step>\r
+                               <para>Jot down the usernames/passwords of the two Jabber users created when OpenSRF was previously installed these users will correspond to \r
+                               entries in opensrf_core.xml. </para>\r
+                       </step>\r
+                       <step>\r
+                               <para>Important: Backup your current opensrf.xml and opensrf_core.xml configuration files.</para>\r
+<screen>\r
+<userinput>cp -p /openils/conf/opensrf.xml /openils/conf/opensrf.xml.backup</userinput>\r
+<userinput>cp -p /openils/conf/opensrf_core.xml /openils/conf/opensrf_core.xml.backup</userinput>\r
+</screen>\r
+                       </step>\r
+                       <step>\r
+                               <para>As the <systemitem class="username">opensrf</systemitem> user, copy the <filename>/openils/conf/opensrf_core.xml<filename> and \r
+                               <filename>/openils/conf/opensrf.xml</filename> configuration files from the example templates:</para>\r
+<screen>\r
+<userinput>cp /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml</userinput>\r
+<userinput>cp /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml</userinput>\r
+</screen>\r
+                               <para>Edit <filename>/openils/conf/opensrf_core.xml</filename> to change the Jabber usernames and passwords you jotted down earlier.</para> \r
+                       </step>\r
+                       <step>\r
+                               <para>As the <systemitem class="username">root</systemitem> user, Run the following command:</para>\r
+<screen>\r
+<userinput>ldconfig</userinput>\r
+</screen>\r
                        </step>\r
                        <step>\r
                                <para>Restart and Test OpenSRF</para>\r
@@ -150,8 +175,15 @@ Request Time in seconds: 0.007519
 \r
 srfsh#\r
 </screen>      \r
-                               <para>If test completed successfully move onto the next section. \r
-                               Otherwise, refer to the <link linkend="troubleshooting">troubleshooting</link> chapter \r
+                       </step> \r
+                       <step>                  \r
+                               <para>If test completed successful restore your Evergreen configuration files:</para>\r
+<screen><userinput>\r
+cp /openils/conf/opensrf.xml.backup /openils/conf/opensrf.xml\r
+cp /openils/conf/opensrf_core.xml.backup /openils/conf/opensrf_core.xml\r
+</userinput></screen>\r
+               \r
+                               <para>and move on to the next section to upgrade Evergreen. Otherwise, refer to the <link linkend="troubleshooting">troubleshooting</link> chapter \r
                                of this documentation.</para> \r
                        </step> \r
                </procedure>    \r