You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by bu...@apache.org on 2012/10/11 22:01:23 UTC

svn commit: r834832 - in /websites/staging/vcl/trunk/content: ./ docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.html

Author: buildbot
Date: Thu Oct 11 20:01:23 2012
New Revision: 834832

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 Thu Oct 11 20:01:23 2012
@@ -1 +1 @@
-1397269
+1397271

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 Thu Oct 11 20:01:23 2012
@@ -153,59 +153,59 @@ chown apache /var/www/html/vcl/.ht-inc/m
 <li>
 <p>make some 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-&gt;Additional User Permissions-&gt;Manage Block Allocations. Users with this permission are notified of new block allocation requests. Remove</p>
-<div class="codehilite"><pre><span class="nv">$blockNotifyUsers</span>
+<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><s
 pan class="o">-&gt;</span><span class="n">Additional</span> <span class="n">User</span> <span class="n">Permissions</span><span class="o">-&gt;</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>
+<p>rom 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">-&gt;</span><span class="n">Additional</span> <span class="n">User</span> <span class="n">Permissions</span><span class="o">-&gt;</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="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="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">&quot;DEFAULTLOCALE&quot;</span><span class="p">,</span> <span class="s">&quot;en_US&quot;</span><span class="p">);</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">&quot;DEFAULTLOCALE&quot;</span><span class="p">,</span> <span class="s">&quot;en_US&quot;</span><span class="p">);</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">&quot;ALLOWADDSHIBUSERS&quot;</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</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">&quot;ALLOWADDSHIBUSERS&quot;</span><span class="p">,</span> <span class="mi">0</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">&quot;lookupuserbeforeauth&quot;</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">&#39;t know what this means, leave it set to 0). If you need to set it to 1, then you will need to set &quot;lookupuserfield&quot; 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">&#39;cn&#39;</span><span class="p">,</span> <span class="s">&#39;uid&#39;</span><span class="p">,</span> <span class="ow">or</span> <span class="s">&#39;samaccountname&#39;</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">&quot;lookupuserbeforeauth&quot;</span> <span class="o">=&gt;</span> <span class="mi">0</span><span class="p">,</span>
-    <span class="s">&quot;lookupuserfield&quot;</span> <span class="o">=&gt;</span> <span class="s">&#39;&#39;</span><span class="p">,</span>
+        <span class="o">::</span><span class="p">:</span><span class="n">BashLexer</span>
+        <span class="s">&quot;lookupuserbeforeauth&quot;</span> <span class="o">=&gt;</span> <span class="mi">0</span><span class="p">,</span>
+        <span class="s">&quot;lookupuserfield&quot;</span> <span class="o">=&gt;</span> <span class="s">&#39;&#39;</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>
+<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">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</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">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</span><span class="p">);</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">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</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">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return 0;&#39;</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">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return NULL;&#39;</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">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return NULL;&#39;</span><span class="p">);</span>
+<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">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return NULL;&#39;</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">&#39;affiliationid&#39;</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">&#39;&#39;</span><span class="p">,</span> <span class="s">&#39;return NULL;&#39;</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>
+<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>
 
 
@@ -214,30 +214,30 @@ chown apache /var/www/html/vcl/.ht-inc/m
 <ol>
 <li>
 <p>Copy 2.2.1 code base to a backup location</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="o">&lt;</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">&gt;</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>
+<div class="codehilite"><pre>    <span class="n">cd</span> <span class="o">&lt;</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">&gt;</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>
 </pre></div>
 
 
 </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>
-<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>
+<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>
-<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>
 </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>
+<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>
   </div>