Author: buildbot
Date: Tue Dec 11 15:38:57 2012
New Revision: 841725
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.1.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec 11 15:38:57 2012
@@ -1 +1 @@
-1420214
+1420228
Modified:
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.1.html
==============================================================================
---
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.1.html
(original)
+++
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.1.html
Tue Dec 11 15:38:57 2012
@@ -186,87 +186,93 @@ different user change below cmd accordin
</li>
<li>
<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
+<p><ol type="a">
+<li>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>
+<div class="codehilite"><pre><span class="nv">$blockNotifyUsers</span>
</pre></div>
-<p>b. A new user group permission that controls who can look up users globally
or for a specific affiliation has been
+<p><li>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>
+<div class="codehilite"><pre><span class="nv">$userlookupUsers</span>
</pre></div>
-<p>c. <strong>Multilingualization</strong> has been added VCL. So,
<strong>DEFAULTLOCALE</strong> has been added to conf.php to set the default
+<p><li><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>
+<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>d. Users authenticated using Shibboleth without also having an LDAP server
can now be added before they log in. <strong>Add
+<p><li>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>
+<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>e. LDAP related items have been simplified in the code using additional
options in $authMechs. For any LDAP entries,
+<p><li>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>
+<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>f. The way the authentication functions toward the bottom of conf.php are
initialized has been simplified. Make the following changes:</p>
-<div class="codehilite"><pre><span class="o">*</span> <span
class="n">REMOVE</span>
+<p><li>The way the authentication functions toward the bottom of conf.php are
initialized has been simplified. Make the following changes:</p>
+<ul>
+<li>
+<p>REMOVE</p>
+<div class="codehilite"><pre><span class="nv">$affilValFunc</span>
+<span class="nv">$affilValFuncArgs</span>
+<span class="nv">$addUserFunc</span>
+<span class="nv">$addUserFuncArgs</span>
+<span class="nv">$updateUserFunc</span>
+<span class="nv">$updateUserFuncArgs</span>
+</pre></div>
+
- <span class="o">::</span><span class="p">:</span><span
class="n">PhpLexer</span>
- <span class="nv">$affilValFunc</span>
- <span class="nv">$affilValFuncArgs</span>
- <span class="nv">$addUserFunc</span>
- <span class="nv">$addUserFuncArgs</span>
- <span class="nv">$updateUserFunc</span>
- <span class="nv">$updateUserFuncArgs</span>
-
-<span class="o">*</span> <span class="n">ADD</span>
-
- <span class="o">::</span><span class="p">:</span><span
class="n">PhpLexer</span>
- <span class="nv">$affilValFunc</span> <span class="o">=</span> <span
class="n">array</span><span class="p">();</span>
- <span class="nv">$affilValFuncArgs</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
- <span class="nv">$addUserFunc</span> <span class="o">=</span> <span
class="n">array</span><span class="p">();</span>
- <span class="nv">$addUserFuncArgs</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
- <span class="nv">$updateUserFunc</span> <span class="o">=</span> <span
class="n">array</span><span class="p">();</span>
- <span class="nv">$updateUserFuncArgs</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
- <span class="k">foreach</span><span class="p">(</span><span
class="nv">$authMechs</span> <span class="n">as</span> <span
class="nv">$key</span> <span class="o">=></span> <span
class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
- <span class="k">if</span><span class="p">(</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'type'</span><span class="p">]</span> <span
class="o">==</span> <span class="s">'ldap'</span><span
class="p">)</span> <span class="p">{</span>
- <span class="nv">$affilValFunc</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="s">'validateLDAPUser'</span><span
class="p">;</span>
- <span class="nv">$affilValFuncArgs</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="nv">$key</span><span class="p">;</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="s">'addLDAPUser'</span><span
class="p">;</span>
- <span class="nv">$addUserFuncArgs</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="nv">$key</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="s">'updateLDAPUser'</span><span
class="p">;</span>
- <span class="nv">$updateUserFuncArgs</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="nv">$key</span><span class="p">;</span>
- <span class="p">}</span>
- <span class="n">elseif</span><span class="p">(</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'type'</span><span class="p">]</span> <span
class="o">==</span> <span class="s">'local'</span><span
class="p">)</span> <span class="p">{</span>
- <span class="nv">$affilValFunc</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">$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>
- <span class="p">}</span>
- <span class="p">}</span>
+</li>
+<li>
+<p>ADD</p>
+<div class="codehilite"><pre><span class="nv">$affilValFunc</span> <span
class="o">=</span> <span class="n">array</span><span class="p">();</span>
+<span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span
class="n">array</span><span class="p">();</span>
+<span class="nv">$addUserFunc</span> <span class="o">=</span> <span
class="n">array</span><span class="p">();</span>
+<span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span
class="n">array</span><span class="p">();</span>
+<span class="nv">$updateUserFunc</span> <span class="o">=</span> <span
class="n">array</span><span class="p">();</span>
+<span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span
class="n">array</span><span class="p">();</span>
+<span class="k">foreach</span><span class="p">(</span><span
class="nv">$authMechs</span> <span class="n">as</span> <span
class="nv">$key</span> <span class="o">=></span> <span
class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
+ <span class="k">if</span><span class="p">(</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'type'</span><span class="p">]</span> <span
class="o">==</span> <span class="s">'ldap'</span><span
class="p">)</span> <span class="p">{</span>
+ <span class="nv">$affilValFunc</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="s">'validateLDAPUser'</span><span
class="p">;</span>
+ <span class="nv">$affilValFuncArgs</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="nv">$key</span><span class="p">;</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="s">'addLDAPUser'</span><span
class="p">;</span>
+ <span class="nv">$addUserFuncArgs</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="nv">$key</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="s">'updateLDAPUser'</span><span
class="p">;</span>
+ <span class="nv">$updateUserFuncArgs</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="nv">$key</span><span class="p">;</span>
+ <span class="p">}</span>
+ <span class="n">elseif</span><span class="p">(</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'type'</span><span class="p">]</span> <span
class="o">==</span> <span class="s">'local'</span><span
class="p">)</span> <span class="p">{</span>
+ <span class="nv">$affilValFunc</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">$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>
+ <span class="p">}</span>
+<span class="p">}</span>
</pre></div>
</li>
+</ul>
+<p></ol> </p>
+</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>
+<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>
@@ -274,37 +280,37 @@ then you will need to set "lookupuserfie
<li>
<p><strong>Update management node code</strong> This step will make a backup
copy of the 2.2 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_</span><span
class="n">managementnode</span>
+<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_</span><span
class="n">managementnode</span>
</pre></div>
</li>
<li>
<p><strong>Copy in the 2.3.1 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.1</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>
+<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.1</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><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>
+<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>
<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>
+<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>
+<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>
