Author: buildbot
Date: Mon Oct 15 15:31:30 2012
New Revision: 835129
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 15 15:31:30 2012
@@ -1 +1 @@
-1398328
+1398338
Modified:
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
==============================================================================
---
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
(original)
+++
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html
Mon Oct 15 15:31:30 2012
@@ -89,18 +89,18 @@
<li>Update Management node vcl code, create a backup, copy in new, make
changes </li>
<li>Restart vcld service</li>
</ul>
-<h1 id="download-and-extract-23-code">Download and Extract 2.3 code</h1>
+<h1 id="detailed-steps-for-upgrade-from-221-to-23">Detailed steps for upgrade
from 2.2.1 to 2.3</h1>
<ol>
<li>follow instructions on VCL 2.3 Release page to download and verify
apache-VCL-2.3.tar.bz2 and put in in /root</li>
<li>
-<p>extract VCL 2.3 code</p>
+<p><strong>extract VCL 2.3 code</strong></p>
<div class="codehilite"><pre><span class="n">tar</span> <span
class="n">xjf</span> <span class="n">apache</span><span class="o">-</span><span
class="n">VCL</span><span class="o">-</span><span class="mf">2.3</span><span
class="o">.</span><span class="n">tar</span><span class="o">.</span><span
class="n">bz2</span>
</pre></div>
</li>
<li>
-<p>Shutdown the httpd and vcld services</p>
+<p><strong>Shutdown</strong> the httpd and vcld services</p>
<div class="codehilite"><pre><span class="n">service</span> <span
class="n">httpd</span> <span class="n">stop</span> <span class="ow">or</span>
<span class="sr">/etc/i</span><span class="n">nit</span><span
class="o">.</span><span class="n">d</span><span class="o">/</span><span
class="n">httpd</span> <span class="n">stop</span>
<span class="n">service</span> <span class="n">vcld</span> <span
class="n">stop</span> <span class="ow">or</span> <span
class="sr">/etc/i</span><span class="n">nit</span><span class="o">.</span><span
class="n">d</span><span class="o">/</span><span class="n">vcld</span> <span
class="n">stop</span>
</pre></div>
@@ -108,7 +108,7 @@
</li>
<li>
-<p>We will create a backup of the vcl database. This will provide a restore
point if necessary.</p>
+<p>We will <strong>create a backup of the vcl database</strong>. This will
provide a restore point if necessary.</p>
<div class="codehilite"><pre><span class="n">mysqldump</span> <span
class="n">vcl</span> <span class="o">></span> <span class="o">~/</span><span
class="n">vcl</span><span class="o">-</span><span class="n">pre2</span><span
class="mf">.3</span><span class="o">-</span><span class="n">upgrade</span><span
class="o">.</span><span class="n">sql</span>
</pre></div>
@@ -123,7 +123,7 @@
</li>
<li>
-<p>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.</p>
+<p><strong>Update the web code</strong>. 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.</p>
<div class="codehilite"><pre><span class="n">cd</span> <span
class="sr">/var/</span><span class="n">www</span><span class="o">/</span><span
class="n">html</span>
<span class="n">mv</span> <span class="n">vcl</span> <span
class="o">~/</span><span class="n">vcl_2</span><span
class="mf">.2.1_</span><span class="n">web</span>
</pre></div>
@@ -131,7 +131,7 @@
</li>
<li>
-<p>Copy the new code in place</p>
+<p><strong>Copy the new code</strong> in place</p>
<div class="codehilite"><pre><span class="n">cd</span> <span
class="sr">/root/</span><span class="n">apache</span><span
class="o">-</span><span class="n">VCL</span><span class="o">-</span><span
class="mf">2.3</span>
<span class="n">cp</span> <span class="o">-</span><span class="n">r</span>
<span class="n">web</span> <span class="sr">/var/</span><span
class="n">www</span><span class="sr">/html/</span><span class="n">vcl</span>
</pre></div>
@@ -139,82 +139,68 @@
</li>
<li>
-<p>Copy your 2.2.1 config files</p>
+<p><strong>Copy your 2.2.1 config files</strong></p>
<p>:::BashLexer
cd ~/vcl_2.2.1_web/.ht-inc
cp conf.php secrets.php pubkey.pem keys.pem /var/www/html/vcl/.ht-inc</p>
</li>
<li>
-<p>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.</p>
+<p><strong>Make the maintenance directory writable by the web server
user</strong>. Normally this is the apache user, if using a different user
change below cmd accordingly.</p>
<div class="codehilite"><pre><span class="nb">chown</span> <span
class="n">apache</span> <span class="sr">/var/</span><span
class="n">www</span><span class="sr">/html/</span><span
class="n">vcl</span><span class="sr">/.ht-inc/m</span><span
class="n">aintenance</span>
</pre></div>
</li>
<li>
-<p>Make changes to conf.php:</p>
-<p>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</p>
+<p><strong>Make changes to conf.php</strong>:</p>
+<p>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. <strong>Remove the following from
conf.php</strong>.</p>
<div class="codehilite"><pre> <span class="nv">$blockNotifyUsers</span>
</pre></div>
-</li>
-</ol>
-<p>from conf.php.</p>
-<div class="codehilite"><pre><span class="n">b</span><span class="o">.</span>
<span class="n">A</span> <span class="k">new</span> <span class="n">user</span>
<span class="n">group</span> <span class="n">permission</span> <span
class="n">that</span> <span class="n">controls</span> <span
class="n">who</span> <span class="n">can</span> <span class="n">look</span>
<span class="n">up</span> <span class="n">users</span> <span
class="n">globally</span> <span class="ow">or</span> <span class="k">for</span>
<span class="n">a</span> <span class="n">specific</span> <span
class="n">affiliation</span> <span class="n">has</span> <span
class="n">been</span> <span class="n">added</span><span class="o">.</span>
<span class="n">It</span> <span class="n">can</span> <span class="n">be</span>
<span class="n">granted</span> <span class="n">to</span> <span
class="n">any</span> <span class="n">user</span> <span class="n">group</span>
<span class="n">under</span> <span class="n">Privileges</span><sp
an class="o">-></span><span class="n">Additional</span> <span
class="n">User</span> <span class="n">Permissions</span><span
class="o">-></span><span class="n">User</span> <span
class="n">Lookup</span><span class="o">.</span> <span class="n">Users</span>
<span class="n">with</span> <span class="n">this</span> <span
class="n">permission</span> <span class="n">can</span> <span
class="n">look</span> <span class="n">up</span> <span
class="n">information</span> <span class="n">about</span> <span
class="n">other</span> <span class="n">users</span><span class="o">.</span>
<span class="n">Remove</span>
-
- <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
- <span class="nv">$userlookupUsers</span>
-
-<span class="n">c</span><span class="o">.</span> <span
class="n">Multilingualization</span> <span class="n">has</span> <span
class="n">been</span> <span class="n">added</span> <span
class="n">VCL</span><span class="o">.</span> <span class="n">So</span><span
class="p">,</span> <span class="n">DEFAULTLOCALE</span> <span
class="n">has</span> <span class="n">been</span> <span class="n">added</span>
<span class="n">to</span> <span class="n">conf</span><span
class="o">.</span><span class="n">php</span> <span class="n">to</span> <span
class="n">set</span> <span class="n">the</span> <span class="n">default</span>
<span class="n">locale</span><span class="o">.</span> <span class="n">Add</span>
-
- <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
- <span class="n">define</span><span class="p">(</span><span
class="s">"DEFAULTLOCALE"</span><span class="p">,</span> <span
class="s">"en_US"</span><span class="p">);</span>
+<p>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. <strong>Remove
the following from conf.php</strong> </p>
+<div class="codehilite"><pre> <span class="nv">$userlookupUsers</span>
</pre></div>
-<p>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.</p>
-<div class="codehilite"><pre><span class="n">d</span><span class="o">.</span>
<span class="n">Users</span> <span class="n">authenticated</span> <span
class="n">using</span> <span class="n">Shibboleth</span> <span
class="n">without</span> <span class="n">also</span> <span
class="n">having</span> <span class="n">an</span> <span class="n">LDAP</span>
<span class="n">server</span> <span class="n">can</span> <span
class="n">now</span> <span class="n">be</span> <span class="n">added</span>
<span class="n">before</span> <span class="n">they</span> <span
class="nb">log</span> <span class="n">in</span><span class="o">.</span> <span
class="n">Add</span>
-
- <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
- <span class="n">define</span><span class="p">(</span><span
class="s">"ALLOWADDSHIBUSERS"</span><span class="p">,</span> <span
class="mi">0</span><span class="p">);</span>
+<p>c. <strong>Multilingualization</strong> has been added VCL. So,
<strong>DEFAULTLOCALE</strong> has been added to conf.php to set the default
locale. <strong>Add the following to conf.php</strong>, changing en_US if
needed to match your locale. You can look in /var/www/html/vcl/locale to see
which ones are available.</p>
+<div class="codehilite"><pre> <span class="n">define</span><span
class="p">(</span><span class="s">"DEFAULTLOCALE"</span><span
class="p">,</span> <span class="s">"en_US"</span><span
class="p">);</span>
</pre></div>
-<p>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.</p>
-<div class="codehilite"><pre><span class="n">e</span><span class="o">.</span>
<span class="n">Some</span> <span class="n">LDAP</span> <span
class="n">related</span> <span class="n">items</span> <span
class="n">have</span> <span class="n">been</span> <span
class="n">simplified</span> <span class="n">in</span> <span
class="n">the</span> <span class="n">code</span> <span class="n">using</span>
<span class="n">some</span> <span class="n">additional</span> <span
class="n">options</span> <span class="n">in</span> <span
class="nv">$authMechs</span><span class="o">.</span> <span class="n">For</span>
<span class="n">any</span> <span class="n">LDAP</span> <span
class="n">entries</span><span class="p">,</span> <span class="n">you</span>
<span class="n">need</span> <span class="n">to</span> <span
class="n">add</span> <span class="n">two</span> <span
class="n">options</span><span class="o">.</span> <span
class="s">"lookupuserbeforeauth"</span> <span class="n">is</span>
<span cl
ass="n">used</span> <span class="k">if</span> <span class="n">you</span> <span
class="n">need</span> <span class="n">VCL</span> <span class="n">to</span>
<span class="n">look</span> <span class="n">up</span> <span
class="n">the</span> <span class="n">full</span> <span class="n">DN</span>
<span class="n">of</span> <span class="n">a</span> <span class="n">user</span>
<span class="ow">and</span> <span class="k">use</span> <span
class="n">that</span> <span class="n">when</span> <span class="n">doing</span>
<span class="n">the</span> <span class="nb">bind</span> <span
class="n">that</span> <span class="n">authenticates</span> <span
class="n">the</span> <span class="n">user</span> <span class="p">(</span><span
class="k">if</span> <span class="n">you</span> <span class="n">don</span><span
class="s">'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&
#39;</span><span class="n">s</span> <span class="n">DN</span> <span
class="p">(</span><span class="n">typically</span> <span
class="n">either</span> <span class="s">'cn'</span><span
class="p">,</span> <span class="s">'uid'</span><span class="p">,</span>
<span class="ow">or</span> <span class="s">'samaccountname'</span><span
class="p">)</span><span class="o">.</span> <span class="n">Add</span>
-
- <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
- <span class="s">"lookupuserbeforeauth"</span> <span
class="o">=></span> <span class="mi">0</span><span class="p">,</span>
- <span class="s">"lookupuserfield"</span> <span
class="o">=></span> <span class="s">''</span><span class="p">,</span>
+<p>d. Users authenticated using Shibboleth without also having an LDAP server
can now be added before they log in. <strong>Add the following to
conf.php</strong> 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.</p>
+<div class="codehilite"><pre> <span class="n">define</span><span
class="p">(</span><span class="s">"ALLOWADDSHIBUSERS"</span><span
class="p">,</span> <span class="mi">0</span><span class="p">);</span>
</pre></div>
-<p>to each LDAP array you have in the $authMech array in conf.php.</p>
-<div class="codehilite"><pre><span class="n">f</span><span class="o">.</span>
<span class="n">If</span> <span class="n">you</span> <span class="n">are</span>
<span class="n">using</span> <span class="n">any</span> <span
class="n">Local</span> <span class="n">accounts</span> <span
class="k">for</span> <span class="n">authentication</span><span
class="p">,</span> <span class="n">you</span> <span class="n">need</span> <span
class="n">to</span> <span class="n">modify</span> <span class="n">the</span>
<span class="n">entries</span> <span class="k">for</span> <span
class="nv">$addUserFunc</span> <span class="ow">and</span> <span
class="nv">$updateUserFunc</span><span class="o">.</span> <span
class="n">Change</span>
-
- <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
- <span class="nv">$addUserFunc</span><span class="p">[</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return 0;'</span><span class="p">);</span>
- <span class="nv">$updateUserFunc</span><span class="p">[</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return 0;'</span><span class="p">);</span>
+<p>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,
<strong>Add the following to each LDAP</strong> array you have in the $authMech
array.</p>
+<div class="codehilite"><pre> <span
class="s">"lookupuserbeforeauth"</span> <span class="o">=></span>
<span class="mi">0</span><span class="p">,</span>
+ <span class="s">"lookupuserfield"</span> <span
class="o">=></span> <span class="s">''</span><span class="p">,</span>
</pre></div>
-<p>to</p>
-<div class="codehilite"><pre> <span class="nv">$addUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return NULL;'</span><span class="p">);</span>
- <span class="nv">$updateUserFunc</span><span class="p">[</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return NULL;'</span><span class="p">);</span>
+<p>f. If you are using any Local accounts for authentication, you need to
modify the entries for $addUserFunc and $updateUserFunc. Change</p>
+<div class="codehilite"><pre> <span class="n">OLD</span>
+ <span class="nv">$addUserFunc</span><span class="p">[</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return 0;'</span><span class="p">);</span>
+ <span class="nv">$updateUserFunc</span><span class="p">[</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return 0;'</span><span class="p">);</span>
+
+ <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
+ <span class="n">NEW</span>
+ <span class="nv">$addUserFunc</span><span class="p">[</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return NULL;'</span><span class="p">);</span>
+ <span class="nv">$updateUserFunc</span><span class="p">[</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return NULL;'</span><span class="p">);</span>
</pre></div>
-<h1 id="restart-httpd-service">Restart httpd service</h1>
-<div class="codehilite"><pre> <span class="n">service</span> <span
class="n">httpd</span> <span class="n">start</span> <span class="ow">or</span>
<span class="sr">/etc/i</span><span class="n">nit</span><span
class="o">.</span><span class="n">d</span><span class="o">/</span><span
class="n">httpd</span> <span class="n">start</span>
+</li>
+<li>
+<p><strong>Restart httpd service</strong></p>
+<div class="codehilite"><pre> <span class="n">service</span> <span
class="n">httpd</span> <span class="n">start</span> <span class="ow">or</span>
<span class="sr">/etc/i</span><span class="n">nit</span><span
class="o">.</span><span class="n">d</span><span class="o">/</span><span
class="n">httpd</span> <span class="n">start</span>
</pre></div>
-<h1 id="update-management-node-code">Update management node code</h1>
-<p>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.</p>
-<ol>
+</li>
<li>
-<p>Copy 2.2.1 code base to a backup location</p>
+<p><strong>Update management node code</strong> 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.</p>
<div class="codehilite"><pre> <span class="n">cd</span> <span
class="o"><</span><span class="n">your</span> <span class="n">vcl</span>
<span class="n">MN</span> <span class="n">code</span> <span
class="n">root</span> <span class="n">path</span><span class="o">></span>
<span class="n">ie</span><span class="o">.</span> <span
class="n">cd</span> <span class="sr">/usr/</span><span
class="nb">local</span><span class="o">/</span>
<span class="n">cp</span> <span class="o">-</span><span class="n">r</span>
<span class="n">vcl</span> <span class="o">~/</span><span
class="n">vcl_2</span><span class="mf">.2.1_</span><span
class="n">managementnode</span>
@@ -223,23 +209,34 @@ cp conf.php secrets.php pubkey.pem keys.
</li>
<li>
-<p>Copy in the 2.3 code base to /usr/local, copying in should preserve any
drivers or other files you've added.</p>
+<p><strong>Copy in the 2.3 code base to /usr/local</strong>, copying in should
preserve any drivers or other files you've added.</p>
<div class="codehilite"><pre> <span class="sr">/bin/c</span><span
class="n">p</span> <span class="o">-</span><span class="n">r</span> <span
class="sr">/root/</span><span class="n">apache</span><span
class="o">-</span><span class="n">VCL</span><span class="o">-</span><span
class="mf">2.3</span><span class="sr">/managementnode/</span><span
class="o">*</span> <span class="sr">/usr/</span><span
class="nb">local</span><span class="o">/</span><span class="n">vcl</span>
</pre></div>
</li>
<li>
-<p>Run install_perl_libs.pl to add any new perl library requirements:</p>
+<p><strong>Run install_perl_libs.pl</strong> to add any new perl library
requirements:</p>
<div class="codehilite"><pre> <span class="sr">/usr/</span><span
class="nb">local</span><span class="sr">/vcl/</span><span
class="n">bin</span><span class="o">/</span><span
class="n">install_perl_libs</span><span class="o">.</span><span
class="n">pl</span>
</pre></div>
</li>
-</ol>
-<h1 id="restart-vcld-service">Restart vcld service</h1>
-<div class="codehilite"><pre> <span class="n">service</span> <span
class="n">vcld</span> <span class="n">start</span> <span class="ow">or</span>
<span class="sr">/etc/i</span><span class="n">nit</span><span
class="o">.</span><span class="n">d</span><span class="o">/</span><span
class="n">vcld</span> <span class="n">start</span>
+<li>
+<p><strong>Restart vcld service</strong></p>
+<div class="codehilite"><pre> <span class="n">service</span> <span
class="n">vcld</span> <span class="n">start</span> <span class="ow">or</span>
<span class="sr">/etc/i</span><span class="n">nit</span><span
class="o">.</span><span class="n">d</span><span class="o">/</span><span
class="n">vcld</span> <span class="n">start</span>
+</pre></div>
+
+
+</li>
+<li>
+<p>Make some test reservations and watch the vcld.log to verify everything is
working correctly.</p>
+<div class="codehilite"><pre> <span class="n">tail</span> <span
class="o">-</span><span class="n">f</span> <span class="sr">/var/</span><span
class="nb">log</span><span class="o">/</span><span class="n">vcld</span><span
class="o">.</span><span class="nb">log</span>
</pre></div>
+
+
+</li>
+</ol>
</div>
<div id="footer">
