From bba8065f1271e6a319ca7e3be5ca0993557673b0 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Sat, 8 Sep 2018 09:37:12 -0400 Subject: [PATCH] Fix lingering git merge messages in upgrade docs. --- docs/installation/server_upgrade.adoc | 58 ----------------------------------- 1 file changed, 58 deletions(-) diff --git a/docs/installation/server_upgrade.adoc b/docs/installation/server_upgrade.adoc index 7146c233b4..1e5e797a0e 100644 --- a/docs/installation/server_upgrade.adoc +++ b/docs/installation/server_upgrade.adoc @@ -43,21 +43,12 @@ osrf_control --localhost --stop-all .. Back up the /openils directory. . Upgrade OpenSRF. Download and install the latest version of OpenSRF from the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page]. -<<<<<<< HEAD -. As the *opensrf* user, download and extract Evergreen 2.12.0: -+ -[source, bash] ------------------------------------------------ -wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.12.0.tar.gz -tar xzf Evergreen-ILS-2.12.0.tar.gz -======= . As the *opensrf* user, download and extract Evergreen 3.0.2: + [source, bash] ----------------------------------------------- wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.0.2.tar.gz tar xzf Evergreen-ILS-3.0.2.tar.gz ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog ----------------------------------------------- + [NOTE] @@ -67,11 +58,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl + [source, bash] --------------------------------------------- -<<<<<<< HEAD -cd /home/opensrf/Evergreen-ILS-2.12.0 -======= cd /home/opensrf/Evergreen-ILS-3.0.2 ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog --------------------------------------------- + On the next command, replace `[distribution]` with one of these values for your @@ -95,11 +82,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution] + [source, bash] ------------------------------------------------------------ -<<<<<<< HEAD -cd /home/opensrf/Evergreen-ILS-2.12.0 -======= cd /home/opensrf/Evergreen-ILS-3.0.2 ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf make ------------------------------------------------------------ @@ -110,24 +93,8 @@ These instructions assume that you have also installed OpenSRF under /openils/. + [source, bash] ------------------------------------------------------------ -<<<<<<< HEAD -cd /home/opensrf/Evergreen-ILS-2.12.0 -make install ------------------------------------------------------------- -+ - -**Note** that this version of Evergreen does not use the legacy XUL staff -client by default, but if you wish to use a versioned XUL staff client, you -can supply `STAFF_CLIENT_STAMP` during the `make install` step like this: -+ -[source, bash] ------------------------------------------------------------- -cd /home/opensrf/Evergreen-ILS-2.12.0 -make STAFF_CLIENT_STAMP_ID=rel_2_12_rc install -======= cd /home/opensrf/Evergreen-ILS-3.0.2 make STAFF_CLIENT_STAMP_ID=rel_3_0_2 install ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog ------------------------------------------------------------ + . As the *root* user, change all files to be owned by the opensrf user and group: @@ -144,11 +111,7 @@ chown -R opensrf:opensrf /openils ----------------------------------------------------------- cd /openils/var/web/xul/ rm server -<<<<<<< HEAD -ln -sf rel_2_12_rc/server server -======= ln -sf rel_3_0_2/server server ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog ---------------------------------------------------------- + . As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the @@ -168,11 +131,7 @@ Copying these configuration files will remove any customizations you have made t + [source, bash] ------------------------------------------------------------------------- -<<<<<<< HEAD -cd /home/opensrf/Evergreen-ILS-2.12.0 -======= cd /home/opensrf/Evergreen-ILS-3.0.2 ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \ --create-offline --database evergreen --host localhost --user evergreen --password evergreen ------------------------------------------------------------------------- @@ -196,33 +155,21 @@ The diff command can be used to show the differences between the distribution ve + [source, bash] ---------------------------------------------------------- -<<<<<<< HEAD -cp /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup -======= cp /home/opensrf/Evergreen-ILS-3.0.2/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog ---------------------------------------------------------- + .. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf. + [source, bash] ---------------------------------------------------------- -<<<<<<< HEAD -cp /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf -======= cp /home/opensrf/Evergreen-ILS-3.0.2/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog ---------------------------------------------------------- + .. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf. + [source, bash] ---------------------------------------------------------- -<<<<<<< HEAD -cp /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf -======= cp /home/opensrf/Evergreen-ILS-3.0.2/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog ---------------------------------------------------------- Upgrade the Evergreen database schema @@ -321,13 +268,8 @@ as a user with the ability to connect to the database server. [source, bash] ---------------------------------------------------------- -<<<<<<< HEAD -cd /home/opensrf/Evergreen-ILS-2.12.0/Open-ILS/src/sql/Pg -psql -U evergreen -h localhost -f version-upgrade/2.11.3-2.12.0-upgrade-db.sql evergreen -======= cd /home/opensrf/Evergreen-ILS-3.0.2/Open-ILS/src/sql/Pg psql -U evergreen -h localhost -f version-upgrade/3.0.1-3.0.2-upgrade-db.sql evergreen ->>>>>>> 0d8062a... Bumping version numbers, adding Upgrade Script and Changelog ---------------------------------------------------------- [TIP] -- 2.11.0