Index: openacs-4/packages/acs-core-docs/www/upgrade-openacs-files.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/upgrade-openacs-files.html,v diff -u -N -r1.23.2.2 -r1.23.2.3 --- openacs-4/packages/acs-core-docs/www/upgrade-openacs-files.html 12 Dec 2010 00:07:03 -0000 1.23.2.2 +++ openacs-4/packages/acs-core-docs/www/upgrade-openacs-files.html 12 Dec 2010 01:37:26 -0000 1.23.2.3 @@ -1,12 +1,6 @@ -<<<<<<< upgrade-openacs-files.html - -
OpenACS is distributed in many different ways: -
as a collection of files
as one big tarball
via CVS
via automatic download from within the APM -======= -
OpenACS is distributed in many different ways: +
OpenACS is distributed in many different ways:
as a collection of files
as one big tarball
via CVS
via automatic download from within the APM ->>>>>>> 1.25 (package manager)
Upgrades work by first changing the file system (via any of the previous methods), and then using the APM to scan the @@ -16,13 +10,8 @@ using the last method, you can skip this page. This page describes whether or not you need to be upgrading using this page or not: -<<<<<<< upgrade-openacs-files.html - Section , “Upgrading an OpenACS 5.0.0 or greater installation” -
Upgrading files for a site which is not in a CVS repository. Unpack the tarball into a new directory and copy its -======= Upgrading an OpenACS 5.0.0 or greater installation -
Upgrading files for a site which is not in a CVS repository. Unpack the tarball into a new directory and copy its ->>>>>>> 1.25 +
Upgrading files for a site which is not in a CVS repository. Unpack the tarball into a new directory and copy its contents on top of your working directory. Or just 'install software', select remote repository, and upgrade your files from there.
[root root]#su - $OPENACS_SERVICE_NAME
@@ -43,11 +32,7 @@ with the latest OpenACS version, without overriding your own local customizations.This diagram explains the basic idea. However, the labels are incorrect. Step 1(a) has been removed, and Step -<<<<<<< upgrade-openacs-files.html - 1(b) should be labelled Step 1.
Step 0: Set up a working CVS checkout. To get your OpenACS code into your local CVS -======= - 1(b) should be labelled Step 1.
Step 0: Set up a working CVS checkout. To get your OpenACS code into your local CVS ->>>>>>> 1.25 + 1(b) should be labelled Step 1.
Step 0: Set up a working CVS checkout. To get your OpenACS code into your local CVS repository, you will set up a working CVS checkout of OpenACS. When you want to update your site, you'll update the working CVS checkout, import those changes @@ -112,13 +97,8 @@
[$OPENACS_SERVICE_NAME ~]$cd /var/lib/aolserver/$OPENACS_SERVICE_NAME
[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$cvs up -Pd
(CVS feedback) -<<<<<<< upgrade-openacs-files.html -[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$If you are upgrading a production OpenACS site which is on a private CVS tree, this process lets you do the upgrade without risking extended downtime or an unusable site:
Declare a freeze on new cvs updates - ie, you cannot run cvs update - on the production site
-======= -[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$
If you are upgrading a production OpenACS site which is on a private CVS tree, this process lets you do the upgrade without risking extended downtime or an unusable site:
Declare a freeze on new cvs updates - ie, you cannot run cvs update +[$OPENACS_SERVICE_NAME $OPENACS_SERVICE_NAME]$
If you are upgrading a production OpenACS site which is on a private CVS tree, this process lets you do the upgrade without risking extended downtime or an unusable site:
Declare a freeze on new cvs updates - ie, you cannot run cvs update on the production site
->>>>>>> 1.25 Make a manual backup of the production site in addition to the automated backups
Import the new code (for example, OpenACS 5.0.4, openacs-5-0-compat versions of ETP, blogger, and other applications) into a "vendor branch" of the