Move PostgreSQL ifnormation from ServersideInstallation to Admin misc.
[working/Evergreen.git] / 1.6 / admin / ServersideInstallation.xml
index 8d09eda..f0bd310 100644 (file)
@@ -7,7 +7,6 @@
                        of the software is straightforward if you follow some simple directions.</para>\r
                </abstract>\r
        </info>\r
-       <section xml:id="serversideinstallation-overview">\r
                <para>Installing, configuring and testing the Evergreen server-side software is straightforward with the current stable software release. See \r
                <xref linkend="serversideinstallation-all"/> for instructions tailored to installing on some particular distributions of the <systemitem class="osname">Linux</systemitem> \r
                operating system. Earlier software distributions are described in <xref linkend="serversideinstallation-previousversions"/>.</para>\r
                <systemitem class="osname">Linux</systemitem> environment). It can also be installed to run on other <systemitem class="osname">Linux</systemitem> systems via virtualized \r
                environments (using, for example, <application>"VirtualBox"</application> or <application>"VMware"</application>). More information on virtualized environments can be \r
                found in <xref linkend="serversideinstallation-virtual"/>.</para>\r
-               <para>Installation of some sub-components of the Evergreen server-side software is mentioned only in abbreviated form in this section. More detailed information \r
-               is available in <xref linkend="serversideinstallation-postgresql"/> and <xref linkend="serversideinstallation-apache"/>.</para>\r
-               <para>Finally, installation of the Evergreen Staff Client software is reviewed in <xref linkend="serversideinstallation-staffclient"/>. </para>\r
-               <simplesect>\r
-                       <title>Evergreen Software Dependencies</title>\r
+               <para>Installation of the Evergreen Staff Client software is reviewed in <xref linkend="serversideinstallation-staffclient"/>. </para>\r
                        <para>The Evergreen server-side software has dependencies on particular versions of certain major software sub-components. Successful installation of Evergreen \r
                        software requires that software versions agree with those listed here:</para>\r
                        <table xml:id="serversideinstall-software-dependencies">\r
                                                        <entry>1.2</entry>\r
                                                        <entry>8.2 / 8.3</entry>\r
                                                </row>\r
-                                               <row>\r
-                                                       <entry>1.4.x</entry>\r
-                                                       <entry>1.0</entry>\r
-                                                       <entry>8.1 / 8.2</entry>\r
-                                               </row>\r
-                                               <row>\r
-                                                       <entry>1.2.x</entry>\r
-                                                       <entry>0.9</entry>\r
-                                                       <entry>8.1 / 8.2</entry>\r
-                                               </row>\r
                                        </tbody>\r
                                </tgroup>\r
-                       </table>\r
-               </simplesect>   \r
-               <simplesect>\r
-                       <title>Current Stable Software Release</title>\r
-                       <para>The current stable release of Evergreen is version <emphasis><emphasis role="bold">1.6.0.7</emphasis></emphasis>. Instructions for installing, configuring \r
-                       and testing that version on the <systemitem class="osname">Ubuntu</systemitem> or <systemitem class="osname">Debian</systemitem> \r
-                       <systemitem class="osname">Linux</systemitem> systems are found in <xref linkend="serversideinstallation-ubuntudebian"/>.</para>\r
-                       <para>This release of Evergreen software is dependent on the Open Service Request Framework (OpenSRF). The current stable release of OpenSRF is \r
-                       version <emphasis><emphasis role="bold">1.2.2</emphasis></emphasis>. Instructions for installing, configuring and testing that version are found in \r
-                       <xref linkend="serversideinstallation-opensrf"/>.</para>\r
-                       </simplesect>\r
-                       <simplesect>\r
-                       <title>Previous Software Releases</title>\r
-                       <para>Earlier releases of Evergreen are also available. Instructions for installing, configuring and testing earlier versions are found in \r
-                       <xref linkend="serversideinstallation-previousversions"/>.</para>\r
-                       <para>The next most recent previous release of Evergreen is version <emphasis><emphasis role="bold">1.4.0.6</emphasis></emphasis>. Instructions for installing, configuring \r
-                       and testing that version are found in <xref linkend="serversideinstallation-evergreen-previous"/>.</para>\r
-                       <para>The accompanying previous release of OpenSRF is version <emphasis><emphasis role="bold">1.0.7</emphasis></emphasis>. Instructions for installing, configuring and testing \r
-                       that version are found in <xref linkend="serversideinstallation-opensrf-previous"/>.</para>\r
-               </simplesect>\r
-       </section>\r
+                       </table>        \r
        <section xml:id="serversideinstallation-all">\r
                <title>Installing Server-Side Software</title>\r
                <para>This section describes the installation of the major components of Evergreen server-side software.</para>\r
                                        <para>As the <systemitem class="username">root</systemitem> user, add the opensrf user to the system. The default shell for the new user is automatically set to \r
                                        <command>/bin/bash</command> to inherit a reasonable environment:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>useradd -m -s /bin/bash opensrf</userinput>\r
 <userinput>passwd opensrf</userinput>\r
 </screen>\r
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract the latest version of OpenSRF. The latest version can be found here: \r
                                        <ulink url="http://evergreen-ils.org/downloads/OpenSRF-1.2.2.tar.gz"></ulink></para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>wget http://evergreen-ils.org/downloads/OpenSRF-1.2.2.tar.gz</userinput>\r
 <userinput>tar zxf OpenSRF-1.2.2.tar.gz</userinput>\r
 </screen>              \r
                                        <systemitem class="osname">Linux</systemitem> distribution listed in the <link linkend="serversideinstallation-keywords-opensrf">distribution \r
                                        keywords</link>table.</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /home/opensrf/OpenSRF-1.2.2</userinput>\r
 <userinput>make -f src/extras/Makefile.install [DISTRIBUTION]</userinput>\r
 </screen>\r
                                        utility to prepare for the next step of compiling and linking the software. You can include the  <option>--enable-python</option> and \r
                                        <option>--enable-java</option> configuration options if you wish to include support for Python and Java, respectively:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/OpenSRF-1.2.2</userinput>\r
 <userinput>./configure --prefix=/openils --sysconfdir=/openils/conf</userinput>\r
 <userinput>make</userinput>\r
                                        <para>As the <systemitem class="username">root</systemitem> user, return to the OpenSRF build directory and use the <command>make</command> utility to compile, \r
                                        link and install OpenSRF:</para>                        \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/OpenSRF-1.2.2</userinput>\r
 <userinput>make install</userinput>\r
 </screen>\r
                                        command <command>ldconfig</command> to automatically read the file and modify the system dynamic library path:</para>\r
                                \r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>echo "/openils/lib" > /etc/ld.so.conf.d/osrf.conf</userinput>\r
 <userinput>ldconfig</userinput>\r
 </screen>\r
@@ -260,7 +219,6 @@ $ /etc/init.d/ejabberd stop
                                        <systemitem class="daemon">epmd</systemitem> processes, then edit the configuration file <filename>/etc/ejabberd/ejabberd.cfg</filename> to hardcode a \r
                                        domain:</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>epmd -kill</userinput>\r
 <userinput>killall beam; killall beam.smp</userinput>\r
 <userinput>rm /var/lib/ejabberd/*</userinput>\r
@@ -314,7 +272,6 @@ $ /etc/init.d/ejabberd stop
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, use the example templates to create the configuration files \r
                                        <filename>/openils/conf/opensrf_core.xml</filename> and <filename>/openils/conf/opensrf.xml</filename>:</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /openils/conf</userinput>\r
 <userinput>cp opensrf.xml.example      opensrf.xml</userinput>\r
 <userinput>cp opensrf_core.xml.example opensrf_core.xml</userinput>\r
@@ -330,35 +287,33 @@ $ /etc/init.d/ejabberd stop
                                                        file.</emphasis>\r
                                                </para>\r
                                        </note>\r
-                                               <title>Updates needed in the file <filename>/openils/conf/opensrf_core.xml</filename></title>\r
-                                       <itemizedlist>\r
-                                               <listitem>/config/opensrf/username = <systemitem class="username">opensrf</systemitem></listitem>\r
-                                               <listitem>/config/opensrf/passwd = password for <systemitem class="domainname">private.localhost</systemitem> \r
-                                               <systemitem class="username">opensrf</systemitem> user</listitem>\r
-                                               <listitem>/config/opensrf/passwd = password for <systemitem class="domainname">private.localhost</systemitem> \r
-                                               <systemitem class="username">opensrf</systemitem>  user</listitem>\r
-                                               <listitem>/config/gateway/username = <systemitem class="username">opensrf</systemitem></listitem>\r
-                                               <listitem>/config/gateway/passwd = password for <systemitem class="domainname">public.localhost</systemitem> \r
-                                               <systemitem class="username">opensrf</systemitem>  user</listitem>\r
-                                               <listitem>/config/routers/router/transport  (first entry, where \r
-                                               <quote>transport/server</quote> ==<systemitem class="domainname">public.localhost</systemitem>) \r
+                                               \r
+                                               <para>/config/opensrf/username = <systemitem class="username">opensrf</systemitem></para>\r
+                                               <para>/config/opensrf/passwd = password for <systemitem class="domainname">private.localhost</systemitem> \r
+                                               <systemitem class="username">opensrf</systemitem> user</para>\r
+                                               <para>/config/opensrf/passwd = password for <systemitem class="domainname">private.localhost</systemitem> \r
+                                               <systemitem class="username">opensrf</systemitem>  user</para>\r
+                                               <para>/config/gateway/username = <systemitem class="username">opensrf</systemitem></para>\r
+                                               <para>/config/gateway/passwd = password for <systemitem class="domainname">public.localhost</systemitem>\r
+                                               <systemitem class="username">opensrf</systemitem>  user</para>\r
+                                               <para>/config/routers/router/transport  (first entry, where \r
+                                               <quote>transport/server</quote> ==<systemitem class="domainname">public.localhost</systemitem>)</para>\r
                                                        <itemizedlist>\r
                                                                <listitem>username = <systemitem class="username">router</systemitem></listitem> \r
                                                                <listitem>password = password for <systemitem class="domainname">public.localhost</systemitem> \r
                                                                <systemitem class="username">router</systemitem> \r
                                                                user</listitem>\r
                                                        </itemizedlist>\r
-                                               </listitem>\r
-                                               <listitem>/config/routers/router/transport  (second entry, where \r
-                                               <quote>transport/server</quote> == <systemitem class="domainname">private.localhost</systemitem>) \r
+                                               \r
+                                               <para>/config/routers/router/transport  (second entry, where \r
+                                               <quote>transport/server</quote> == <systemitem class="domainname">private.localhost</systemitem>) </para>\r
                                                        <itemizedlist>\r
                                                                <listitem>username = <systemitem class="username">router</systemitem></listitem> \r
                                                                <listitem>password = password for <systemitem class="domainname">private.localhost</systemitem> \r
                                                                <systemitem class="username">router</systemitem> \r
                                                                user</listitem>\r
                                                        </itemizedlist>\r
-                                               </listitem>\r
-                                       </itemizedlist>\r
+                                               \r
                                        <para>You also need to specify the domains from which <systemitem class="service">OpenSRF</systemitem> will accept and to which \r
                                        <systemitem class="service">OpenSRF</systemitem> will make connections. If you are installing <application>OpenSRF</application> on a single server and using the \r
                                        <systemitem class="domainname">private.localhost</systemitem> / <systemitem class="domainname">public.localhost</systemitem> domains, these will already be set to \r
@@ -418,7 +373,6 @@ $ /etc/init.d/ejabberd stop
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, modify the environmental variable <envar>PATH</envar> by adding a new file path to \r
                                        the <systemitem class="username">opensrf</systemitem> user's shell configuration file <filename>.bashrc</filename>:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>echo "export PATH=/openils/bin:\$PATH" >> ~/.bashrc</userinput>\r
 </screen>\r
                                \r
@@ -428,13 +382,11 @@ $ /etc/init.d/ejabberd stop
                                        <para>As the <systemitem class="username">root</systemitem> user, start the <systemitem class="service">ejabberd</systemitem> and \r
                                        <systemitem class="service">memcached</systemitem> services:</para>                     \r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>/etc/init.d/ejabberd start</userinput>\r
 <userinput>/etc/init.d/memcached start</userinput>\r
 </screen>                      \r
                                        <para>Finally, as the <systemitem class="username">opensrf</systemitem> user, start OpenSRF:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>start the OpenSRF service:</userinput>\r
 <userinput>use "-l" to force hostname to be "localhost"</userinput>\r
 <userinput>osrf_ctl.sh -l -a start_all</userinput>    \r
@@ -459,7 +411,6 @@ $ /etc/init.d/ejabberd stop
                                        <systemitem class="service">math</systemitem> service:</para>\r
                                \r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>/openils/bin/srfsh</userinput>\r
 <prompt>srfsh#</prompt> <userinput>request opensrf.math add 2 2</userinput>\r
 Received Data: 4\r
@@ -476,7 +427,6 @@ Request Time in seconds: 0.007519
                                        <title>Stopping OpenSRF</title>\r
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, stop OpenSRF:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>osrf_ctl.sh -l -a stop_all</userinput>\r
 </screen>              \r
                                </step>\r
@@ -517,7 +467,6 @@ Request Time in seconds: 0.007519
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, download and extract the latest version of Evergreen. The latest version can be found here: \r
                                        <ulink url="http://evergreen-ils.org/downloads/Evergreen-ILS-1.6.0.7.tar.gz"></ulink></para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>wget http://evergreen-ils.org/downloads/Evergreen-ILS-1.6.0.7.tar.gz</userinput>\r
 <userinput>tar zxf Evergreen-ILS-1.6.0.7.tar.gz</userinput>\r
 </screen>\r
@@ -532,7 +481,6 @@ Request Time in seconds: 0.007519
                                        <systemitem class="osname">Linux</systemitem> distribution listed in the \r
                                        <link linkend="serversideinstallation-keywords-evergreen">distribution keywords</link> table.</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7</userinput>\r
 <userinput>make -f Open-ILS/src/extras/Makefile.install [distribution]</userinput>\r
 </screen>\r
@@ -596,7 +544,7 @@ Request Time in seconds: 0.007519
                                        <title>(OPTIONAL) Install the PostgreSQL Server</title>\r
                                        <para>Since the PostgreSQL server is usually a standalone server in multi-server production systems, the prerequisite installer Makefile in the previous step \r
                                        does not automatically install PostgreSQL. If your PostgreSQL server is on a different system, just skip this step.</para>\r
-                                       <para>For further information on manually installing PostgreSQL, see <xref linkend="serversideinstallation-postgresql"/>.</para>\r
+                                       <para>For further information on manually installing PostgreSQL, visit the <link xl:href="http://www.postgresql.org/">PostgreSQL Site</link>.</para>\r
                                        <para>If your PostgreSQL server will be on the same system as your Evergreen software, then as the <systemitem class="username">root</systemitem> user install the \r
                                        required PostgreSQL server packages:</para>\r
                                        <screen><userinput>su - root</userinput></screen>\r
@@ -610,14 +558,13 @@ Request Time in seconds: 0.007519
                                                <command>psql</command>. Then type <userinput>SELECT version();</userinput> to get detailed information of your version of PostgreSQL.</para>\r
                                        </note>\r
                                </step>\r
-                               <step>\r
-                                       <title>Install Perl Modules on PostgreSQL Server (OPTIONAL) </title>\r
+                               <step performance="optional">\r
+                                       <title>Install Perl Modules on PostgreSQL Server</title>\r
                                        <para>If PostgreSQL is running on the same system as your Evergreen software, then the Perl modules will automatically be available. Just skip this step.</para>\r
                                        <para>Otherwise, if your PostgreSQL server is running on another system, then as the <systemitem class="username">root</systemitem> user install the following Perl \r
                                        modules on that system:</para>\r
                                        <para>ensure the gcc compiler is installed:</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>apt-get install gcc</userinput>\r
 </screen>\r
                                <para>install the Perl modules</para>\r
@@ -627,7 +574,7 @@ Request Time in seconds: 0.007519
 <prompt>cpan></prompt> <userinput>install MARC::Record</userinput>\r
 <prompt>cpan></prompt> <userinput>install MARC::File::XML</userinput>\r
 </screen>\r
-                               <para>For more information on installing Perl Modules vist the <link xml:href="http://www.cpan.org/">CPAN</link> site.</para>\r
+                               <para>For more information on installing Perl Modules vist the <link xl:href="http://www.cpan.org/">CPAN</link> site.</para>\r
                                </step>                                 \r
                                <step>\r
                                        <title>Update the System Dynamic Library Path</title>\r
@@ -646,10 +593,7 @@ Request Time in seconds: 0.007519
                                        <title>Restart the PostgreSQL Server</title>\r
                                        <para>If PostgreSQL is running on the same system as the rest of Evergreen, as the <systemitem class="username">root</systemitem> user you must restart \r
                                        PostgreSQL. If PostgreSQL is running on another system, you may skip this step.</para>          \r
-<screen>\r
-<userinput>su - root</userinput>\r
-<userinput>/etc/init.d/postgresql-[PGSQL_VERSION] restart</userinput>\r
-</screen>\r
+                                       <screen><userinput>/etc/init.d/postgresql-[PGSQL_VERSION] restart</userinput></screen>\r
                                        <para>Where <literal>PGSQL_VERSION</literal> is your installed PostgreSQL version (e.g. <literal>8.3</literal>).</para>\r
                                </step>\r
                                <step xml:id="serversideinstallation-configure">\r
@@ -657,7 +601,6 @@ Request Time in seconds: 0.007519
                                        <para>As the <systemitem class="username">opensrf</systemitem> user, return to the Evergreen build directory and use the <command>configure</command> utility to \r
                                        prepare for the next step of compiling and linking the software:</para>\r
 <screen>\r
-<userinput>su - opensrf</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7</userinput>\r
 <userinput>./configure --prefix=/openils --sysconfdir=/openils/conf</userinput>\r
 <userinput>make</userinput>\r
@@ -670,7 +613,6 @@ Request Time in seconds: 0.007519
                                        shown below. The Staff Client will also be automatically built, but you must remember to set the variable <envar>STAFF_CLIENT_BUILD_ID</envar> to match the version                                             of the Staff Client you will use to connect to the Evergreen server.</para>\r
                                        <para>For further information on manually building the Staff Client, see <xref linkend="serversideinstallation-building-staffclient"/>.</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /home/opensrf/Evergreen-ILS-1.6.0.7</userinput>\r
 <userinput>make STAFF_CLIENT_BUILD_ID=rel_1_6_0_7 install</userinput>\r
 </screen>\r
@@ -679,7 +621,6 @@ Request Time in seconds: 0.007519
                                        in the head of the Staff Client directory <filename class="directory">/openils/var/web/xul</filename> that points to the subdirectory \r
                                        <filename class="directory">/server</filename> of the new Staff Client build:</para>    \r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>cd /openils/var/web/xul</userinput>\r
 <userinput>ln -sf rel_1_6_0_7/server server</userinput>\r
 </screen>\r
@@ -690,7 +631,6 @@ Request Time in seconds: 0.007519
                                        files that you set up in a previous step when you installed and tested OpenSRF. You should also create backup copies of the old files for troubleshooting \r
                                        purposes. Finally, change the ownership on the installed files to the <systemitem class="username">opensrf</systemitem> user:</para>\r
 <screen>\r
-<userinput>su - root</userinput>\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
 <userinput>cp /openils/conf/oils_web.xml.example     /openils/conf/oils_web.xml</userinput>\r
@@ -713,13 +653,12 @@ Request Time in seconds: 0.007519
                                                        paths:</para>\r
                                                        <para>Create the database:</para>\r
 <screen>\r
-<userinput>su - postgres</userinput>\r
 <userinput>createdb -E UNICODE evergreen</userinput>\r
 <userinput>createlang plperl   evergreen</userinput>\r
 <userinput>createlang plperlu  evergreen</userinput>\r
 <userinput>createlang plpgsql  evergreen</userinput>\r
 </screen>\r
-                                                       <para>Adjust the paths</para>\r
+                                                       <para>Adjust the paths:</para>\r
 <screen>\r
 <userinput>psql -f /usr/share/postgresql/PGSQL_VERSION/contrib/tablefunc.sql evergreen</userinput>\r
 <userinput>psql -f /usr/share/postgresql/PGSQL_VERSION/contrib/tsearch2.sql  evergreen</userinput>\r
@@ -730,12 +669,8 @@ Request Time in seconds: 0.007519
                                                <step>\r
                                                        <title>Create a new Evergreen superuser</title>\r
                                                        <para>As the <systemitem class="username">postgres</systemitem> user on the PostgreSQL system, create the new database \r
-                                                       <systemitem class="username">evergreen</systemitem> user and assign a password:</para>\r
-                                                                               \r
-<screen>\r
-<userinput>su - postgres</userinput>\r
-<userinput>createuser -P -s evergreen</userinput>\r
-</screen>      \r
+                                                       <systemitem class="username">evergreen</systemitem> user and assign a password:</para>                          \r
+                                                       <screen><userinput>createuser -P -s evergreen</userinput></screen>      \r
                                                        <para>Enter the password twice for new role when prompted.</para>                                       \r
                                                </step>\r
                                                <step>\r
@@ -869,30 +804,26 @@ Request Time in seconds: 0.007519
                                <systemitem class="domainname">public.localhost</systemitem> domains, these will already be set to the correct values. Otherwise, search and replace to match \r
                                your customized values.</para>\r
                                <para>The following example uses common XPath syntax on the left-hand side to indicate the approximate position needing changes within the XML file:</para>\r
-                               <itemizedlist>\r
-                                       <listitem>/config/opensrf/username = <systemitem class="username">opensrf</systemitem></listitem>\r
-                                       <listitem>/config/opensrf/passwd = password for <systemitem class="domainname">private.localhost</systemitem> \r
-                                       <systemitem class="username">opensrf</systemitem> user</listitem>\r
-                                       <listitem>/config/opensrf/passwd = password for <systemitem class="domainname">private.localhost</systemitem> \r
-                                       <systemitem class="username">opensrf</systemitem>  user</listitem>\r
-                                       <listitem>/config/gateway/username = <systemitem class="username">opensrf</systemitem></listitem>\r
-                                       <listitem>/config/gateway/passwd = password for <systemitem class="domainname">public.localhost</systemitem> \r
-                                       <systemitem class="username">opensrf</systemitem>  user</listitem>\r
-                                       <listitem>/config/routers/router/transport  (first entry, where <quote>transport/server</quote> == <systemitem class="domainname">public.localhost</systemitem>) \r
+                               <para>/config/opensrf/username = <systemitem class="username">opensrf</systemitem></para>\r
+                                       <para>/config/opensrf/passwd = password for <systemitem class="domainname">private.localhost</systemitem>\r
+                                       <systemitem class="username">opensrf</systemitem> user</para>\r
+                                       <para>/config/gateway/username = <systemitem class="username">opensrf</systemitem></para>\r
+                                       <para>/config/gateway/passwd = password for <systemitem class="domainname">public.localhost</systemitem> \r
+                                       <systemitem class="username">opensrf</systemitem>  user</para>\r
+                                       <para>/config/routers/router/transport  (first entry, where <quote>transport/server</quote> == <systemitem class="domainname">public.localhost</systemitem>)</para>\r
                                                <itemizedlist>\r
                                                        <listitem>username = <systemitem class="username">router</systemitem></listitem> \r
                                                        <listitem>password = password for <systemitem class="domainname">public.localhost</systemitem> <systemitem class="username">router</systemitem> \r
                                                        user</listitem>\r
                                                </itemizedlist>\r
-                                       </listitem>\r
-                                       <listitem>/config/routers/router/transport  (second entry, where <quote>transport/server</quote> == <systemitem class="domainname">private.localhost</systemitem>) \r
+                                       <para>/config/routers/router/transport  (second entry, where <quote>transport/server</quote> == <systemitem \r
+                                       class="domainname">private.localhost</systemitem>) </para>\r
                                                <itemizedlist>\r
                                                        <listitem>username = <systemitem class="username">router</systemitem></listitem> \r
                                                        <listitem>password = password for <systemitem class="domainname">private.localhost</systemitem> <systemitem class="username">router</systemitem> \r
                                                        user</listitem>\r
                                                </itemizedlist>\r
-                                       </listitem>\r
-                               </itemizedlist>\r
+                                       \r
                        </step>\r
                        <step xml:id="serversideinstallation-srfsh">\r
                                <title>Create Configuration Files for Users Needing <application>"srfsh"</application></title>\r
@@ -958,7 +889,6 @@ Request Time in seconds: 0.007519
                                                <para>As the <systemitem class="username">root</systemitem> user, start the <systemitem class="service">ejabberd</systemitem> and \r
                                                <systemitem class="service">memcached</systemitem> services (if they are not already running):</para>\r
 <screen>\r
-<userinput>su - root</userinput>\r
 <userinput>/etc/init.d/ejabberd start</userinput>\r
 <userinput>/etc/init.d/memcached start</userinput>\r
 </screen>\r