Author: fapeeler
Date: Mon Oct 15 15:31:26 2012
New Revision: 1398338
URL: http://svn.apache.org/viewvc?rev=1398338&view=rev
Log:
CMS commit to vcl by fapeeler
Modified:
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.mdtext
Modified:
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.mdtext
URL:
http://svn.apache.org/viewvc/vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.mdtext?rev=1398338&r1=1398337&r2=1398338&view=diff
==============================================================================
---
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.mdtext
(original)
+++
vcl/site/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.mdtext
Mon Oct 15 15:31:26 2012
@@ -29,22 +29,21 @@ This page provides information on how to
- Update Management node vcl code, create a backup, copy in new, make
changes
- Restart vcld service
-# Download and Extract 2.3 code #
+# Detailed steps for upgrade from 2.2.1 to 2.3 #
1. follow instructions on VCL 2.3 Release page to download and verify
apache-VCL-2.3.tar.bz2 and put in in /root
-2. extract VCL 2.3 code
+2. **extract VCL 2.3 code**
:::BashLexer
tar xjf apache-VCL-2.3.tar.bz2
-3. Shutdown the httpd and vcld services
-
+3. **Shutdown** the httpd and vcld services
:::BashLexer
service httpd stop or /etc/init.d/httpd stop
service vcld stop or /etc/init.d/vcld stop
-4. We will create a backup of the vcl database. This will provide a restore
point if necessary.
+4. We will **create a backup of the vcl database**. This will provide a
restore point if necessary.
:::BashLexer
mysqldump vcl > ~/vcl-pre2.3-upgrade.sql
@@ -56,103 +55,105 @@ This page provides information on how to
mysql vcl < mysql/update-vcl.sql
-6. Update the web code. This step we will move the 2.2.1 web directory out of
the way, so we can copy in the new web code base. After copying in the new
code, we will migrate your configuration changes. These instructions assume
that you installed the vcl web code at /var/www/html/vcl. If you installed it
elsewhere, replace /var/www/html/vcl with your vcl web root.
+6. **Update the web code**. This step we will move the 2.2.1 web directory out
of the way, so we can copy in the new web code base. After copying in the new
code, we will migrate your configuration changes. These instructions assume
that you installed the vcl web code at /var/www/html/vcl. If you installed it
elsewhere, replace /var/www/html/vcl with your vcl web root.
:::BashLexer
cd /var/www/html
mv vcl ~/vcl_2.2.1_web
-7. Copy the new code in place
+7. **Copy the new code** in place
:::BashLexer
cd /root/apache-VCL-2.3
cp -r web /var/www/html/vcl
-8. Copy your 2.2.1 config files
+8. **Copy your 2.2.1 config files**
:::BashLexer
cd ~/vcl_2.2.1_web/.ht-inc
cp conf.php secrets.php pubkey.pem keys.pem /var/www/html/vcl/.ht-inc
-9. Make the maintenance directory writable by the web server user. Normally
this is the apache user, if using a different user change below cmd
accordingly.
+9. **Make the maintenance directory writable by the web server user**.
Normally this is the apache user, if using a different user change below cmd
accordingly.
:::BashLexer
chown apache /var/www/html/vcl/.ht-inc/maintenance
-10. Make changes to conf.php:
+10. **Make changes to conf.php**:
- a. A new user group permission that controls who can manage block
allocations globally or for a specific affiliation has been added. It can be
granted to any user group under Privileges->Additional User Permissions->Manage
Block Allocations. Users with this permission are notified of new block
allocation requests. Remove
+ a. A new user group permission that controls who can manage block
allocations globally or for a specific affiliation has been added. It can be
granted to any user group under Privileges->Additional User Permissions->Manage
Block Allocations. Users with this permission are notified of new block
allocation requests. **Remove the following from conf.php**.
:::BashLexer
$blockNotifyUsers
- from conf.php.
- b. A new user group permission that controls who can look up users
globally or for a specific affiliation has been added. It can be granted to any
user group under Privileges->Additional User Permissions->User Lookup. Users
with this permission can look up information about other users. Remove
+ b. A new user group permission that controls who can look up users
globally or for a specific affiliation has been added. It can be granted to any
user group under Privileges->Additional User Permissions->User Lookup. Users
with this permission can look up information about other users. **Remove the
following from conf.php**
:::BashLexer
$userlookupUsers
- c. Multilingualization has been added VCL. So, DEFAULTLOCALE has been
added to conf.php to set the default locale. Add
+ c. **Multilingualization** has been added VCL. So, **DEFAULTLOCALE** has
been added to conf.php to set the default locale. **Add the following to
conf.php**, changing en_US if needed to match your locale. You can look in
/var/www/html/vcl/locale to see which ones are available.
+
:::BashLexer
define("DEFAULTLOCALE", "en_US");
- to conf.php, changing en_US if needed to match your locale. You can look in
/var/www/html/vcl/locale to see which ones are available.
+
+ d. Users authenticated using Shibboleth without also having an LDAP server
can now be added before they log in. **Add the following to conf.php** If you
are using Shibboleth and would like to be able to add users to groups before
the user has ever logged in to VCL, you can set this to 1. However, please note
that if you typo the userid, there is no way to verify it, and the user will be
added with the typoed userid.
- d. Users authenticated using Shibboleth without also having an LDAP server
can now be added before they log in. Add
:::BashLexer
define("ALLOWADDSHIBUSERS", 0);
- to conf.php. If you are using Shibboleth and would like to be able to add
users to groups before the user has ever logged in to VCL, you can set this to
1. However, please note that if you typo the userid, there is no way to verify
it, and the user will be added with the typoed userid.
- e. Some LDAP related items have been simplified in the code using some
additional options in $authMechs. For any LDAP entries, you need to add two
options. "lookupuserbeforeauth" is used if you need VCL to look up the full DN
of a user and use that when doing the bind that authenticates the user (if you
don't know what this means, leave it set to 0). If you need to set it to 1,
then you will need to set "lookupuserfield" to what LDAP attribute to use when
looking up the user's DN (typically either 'cn', 'uid', or 'samaccountname').
Add
+ e. Some LDAP related items have been simplified in the code using
additional options in $authMechs. For any LDAP entries, add two options.
"lookupuserbeforeauth" is used if you need VCL to look up the full DN of a user
and use that when doing the bind that authenticates the user (if you don't know
what this means, leave it set to 0). If you need to set it to 1, then you will
need to set "lookupuserfield" to what LDAP attribute to use when looking up the
user's DN (typically either 'cn', 'uid', or 'samaccountname'). In conf.php,
**Add the following to each LDAP** array you have in the $authMech array.
:::BashLexer
"lookupuserbeforeauth" => 0,
"lookupuserfield" => '',
- to each LDAP array you have in the $authMech array in conf.php.
-
+
f. If you are using any Local accounts for authentication, you need to
modify the entries for $addUserFunc and $updateUserFunc. Change
:::BashLexer
+ OLD
$addUserFunc[$item['affiliationid']] = create_function('', 'return
0;');
$updateUserFunc[$item['affiliationid']] = create_function('',
'return 0;');
- to
+
:::BashLexer
+ NEW
$addUserFunc[$item['affiliationid']] = create_function('', 'return
NULL;');
$updateUserFunc[$item['affiliationid']] = create_function('',
'return NULL;');
-# Restart httpd service #
+
+11. **Restart httpd service**
:::BashLexer
service httpd start or /etc/init.d/httpd start
-# Update management node code #
-
-This step will make a backup copy of the 2.2.1 vcl code base and then copy the
new code over the existing code to preserve any drivers or other files you've
added.
-
-1. Copy 2.2.1 code base to a backup location
+12. **Update management node code** This step will make a backup copy of the
2.2.1 vcl code base and then copy the new code over the existing code to
preserve any drivers or other files you've added.
:::BashLexer
cd <your vcl MN code root path>
ie. cd /usr/local/
cp -r vcl ~/vcl_2.2.1_managementnode
-2. Copy in the 2.3 code base to /usr/local, copying in should preserve any
drivers or other files you've added.
+13. **Copy in the 2.3 code base to /usr/local**, copying in should preserve
any drivers or other files you've added.
:::BashLexer
/bin/cp -r /root/apache-VCL-2.3/managementnode/* /usr/local/vcl
-3. Run install_perl_libs.pl to add any new perl library requirements:
+14. **Run install_perl_libs.pl** to add any new perl library requirements:
:::BashLexer
/usr/local/vcl/bin/install_perl_libs.pl
-# Restart vcld service #
+15. **Restart vcld service**
:::BashLexer
service vcld start or /etc/init.d/vcld start
+
+16. Make some test reservations and watch the vcld.log to verify everything is
working correctly.
+
+ :::BashLexer
+ tail -f /var/log/vcld.log
