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 2015/02/13 20:07:48 UTC
svn commit: r940070 [3/9] - in /websites/staging/vcl/trunk/content: ./
comm/commprojects/ confluence_export/ dev/ docs/
docs/UpgradePreviousVersions/ docs/archives/old-releases/
Modified: websites/staging/vcl/trunk/content/confluence_export/vcl-2.3.html
==============================================================================
--- websites/staging/vcl/trunk/content/confluence_export/vcl-2.3.html (original)
+++ websites/staging/vcl/trunk/content/confluence_export/vcl-2.3.html Fri Feb 13 19:07:47 2015
@@ -289,8 +289,7 @@ looked up </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-154">VCL-154</a>
] - run_scp_command() is not catching some errors </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-192">VCL-192</a>
-] - xCAT21.pm - does_image_exist routine<br />
-</li>
+] - xCAT21.pm - does_image_exist routine </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-225">VCL-225</a>
] - no user groups to select from when adding a new user group </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-230">VCL-230</a>
@@ -573,13 +572,11 @@ only available machine </li>
] - time delay the display of the Get RDP File button to allow
vcld to grant access </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-446">VCL-446</a>
-] - End of reservation notices<br />
-</li>
+] - End of reservation notices </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-450">VCL-450</a>
] - Backend VMware improvements for 2.3 release </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-453">VCL-453</a>
-] - iptables<br />
-</li>
+] - iptables </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-455">VCL-455</a>
] - put alt text with a image generated by textimage.php </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-460">VCL-460</a>
@@ -651,8 +648,7 @@ wait_* subroutines </li>
] - Add check to image capture to determine if user shutdown
computer </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-557">VCL-557</a>
-] - xCAT2 reset node to boot state on DESTROY<br />
-</li>
+] - xCAT2 reset node to boot state on DESTROY </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-565">VCL-565</a>
] - Convert code which directly accesses
$ENV{management_node_info} </li>
@@ -667,8 +663,7 @@ SSH are handled </li>
<ul>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-30">VCL-30</a>
] - additional user access methods for connecting to reserved
-compute node<br />
-</li>
+compute node </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-323">VCL-323</a>
] - ESX provisioning modules - based on snapshots </li>
<li>[<a href="https://issues.apache.org/jira/browse/VCL-367">VCL-367</a>
Modified: websites/staging/vcl/trunk/content/dev/web-code-overview.html
==============================================================================
--- websites/staging/vcl/trunk/content/dev/web-code-overview.html (original)
+++ websites/staging/vcl/trunk/content/dev/web-code-overview.html Fri Feb 13 19:07:47 2015
@@ -131,7 +131,7 @@
<p>There's one last thing we need to do before linking this in on the site. As described in the "General Processing Flow" section, initGlobals includes the required files based on the current mode's section. So, edit utils.php and scroll toward the end of it where files are included (using require_once) within a switch statement. In the switch statement, before the "default" case, add</p>
<div class="codehilite"><pre><span class="k">case</span> <span class="s">'exampleSection'</span><span class="p">:</span>
<span class="n">require_once</span><span class="p">(</span><span class="s">'.ht-inc/examples.php'</span><span class="p">);</span>
- <span class="n">break</span><span class="p">;</span>
+ <span class="k">break</span><span class="p">;</span>
</pre></div>
@@ -168,22 +168,22 @@ print "<span class="nt"></FORM&g
<p>Now, we have a form that gets displayed when "Example Section" is clicked. Now, we need to add a function to process that form. Add this function to examples.php:</p>
-<div class="codehilite"><pre><span class="n">function</span> <span class="n">submitFunc1Form</span><span class="p">()</span> <span class="p">{</span>
- <span class="nv">$data</span> <span class="o">=</span> <span class="n">getContinuationVar</span><span class="p">();</span>
- <span class="nv">$theoption</span> <span class="o">=</span> <span class="n">processInputVar</span><span class="p">(</span><span class="s">"theoption"</span><span class="p">,</span> <span class="n">ARG_NUMERIC</span><span class="p">);</span>
- <span class="k">if</span><span class="p">(</span><span class="o">!</span> <span class="n">array_key_exists</span><span class="p">(</span><span class="nv">$theoption</span><span class="p">,</span> <span class="nv">$data</span><span class="p">))</span> <span class="p">{</span>
- <span class="k">print</span> <span class="s">"invalid option submitted\n"</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="k">function</span><span class="w"> </span><span class="nf">submitFunc1Form</span><span class="p">()</span><span class="w"> </span><span class="p">{</span>
+ $<span class="n">data</span> <span class="p">=</span> <span class="n">getContinuationVar</span><span class="p">();</span>
+ $<span class="n">theoption</span> <span class="p">=</span> <span class="n">processInputVar</span><span class="p">(</span>"<span class="n">theoption</span>"<span class="p">,</span> <span class="n">ARG_NUMERIC</span><span class="p">);</span>
+ <span class="k">if</span><span class="p">(</span>! <span class="n">array_key_exists</span><span class="p">(</span>$<span class="n">theoption</span><span class="p">,</span> $<span class="n">data</span><span class="p">))</span> <span class="p">{</span>
+ <span class="n">print</span> "<span class="n">invalid</span> <span class="n">option</span> <span class="n">submitted</span><span class="o">\</span><span class="n">n</span>"<span class="p">;</span>
<span class="k">return</span><span class="p">;</span>
<span class="p">}</span>
- <span class="k">print</span> <span class="s">"The option you selected was: "</span><span class="p">;</span>
- <span class="k">print</span> <span class="s">"{$data\[$theoption\]}<br>\n"</span><span class="p">;</span>
+ <span class="n">print</span> "<span class="n">The</span> <span class="n">option</span> <span class="n">you</span> <span class="n">selected</span> <span class="n">was</span><span class="p">:</span> "<span class="p">;</span>
+ <span class="n">print</span> "<span class="p">{</span>$<span class="n">data</span><span class="o">\</span><span class="p">[</span>$<span class="n">theoption</span><span class="o">\</span><span class="p">]}</span><span class="o"><</span><span class="n">br</span><span class="o">>\</span><span class="n">n</span>"<span class="p">;</span>
<span class="p">}</span>
</pre></div>
<p>Next, we add this function to states.php:</p>
-<div class="codehilite"><pre><span class="nv">$actions</span><span class="p">[</span><span class="s">'mode'</span><span class="p">][</span><span class="s">'submitFunc1Form'</span><span class="p">]</span> <span class="o">=</span> <span class="s">"submitFunc1Form"</span><span class="p">;</span>
-<span class="nv">$actions</span><span class="p">[</span><span class="s">'pages'</span><span class="p">][</span><span class="s">'submitFunc1Form'</span><span class="p">]</span> <span class="o">=</span> <span class="s">"exampleSection"</span><span class="p">;</span>
+<div class="codehilite"><pre>$<span class="n">actions</span><span class="p">[</span><span class="s">'mode'</span><span class="p">][</span><span class="s">'submitFunc1Form'</span><span class="p">]</span> <span class="p">=</span> "<span class="n">submitFunc1Form</span>"<span class="p">;</span>
+$<span class="n">actions</span><span class="p">[</span><span class="s">'pages'</span><span class="p">][</span><span class="s">'submitFunc1Form'</span><span class="p">]</span> <span class="p">=</span> "<span class="n">exampleSection</span>"<span class="p">;</span>
</pre></div>
@@ -202,26 +202,26 @@ print "update<span class="nt"></
<p>Next, we need to add the javascript function we just referenced to code.js (in .ht-inc's parent directory) as well as a callback function that will be called when the results of the AJAX call are returned:</p>
-<div class="codehilite"><pre><span class="n">function</span> <span class="n">JS_AJexample</span><span class="p">(</span><span class="n">contid</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">dojo</span><span class="o">.</span><span class="n">xhrPost</span><span class="p">({</span>
- <span class="n">url:</span><span class="s">'index.php'</span><span class="p">,</span>
- <span class="n">load:</span> <span class="n">JS_AJexampleCB</span><span class="p">,</span>
- <span class="n">error:</span> <span class="n">errorHandler</span><span class="p">,</span>
- <span class="n">content:</span> <span class="p">{</span><span class="n">continuation:</span> <span class="n">contid</span><span class="p">},</span>
- <span class="n">timeout:</span> <span class="mi">15000</span>
+<div class="codehilite"><pre><span class="k">function</span><span class="w"> </span><span class="nf">JS_AJexample</span><span class="p">(</span>contid<span class="p">)</span><span class="w"> </span><span class="p">{</span>
+ <span class="n">dojo</span><span class="p">.</span><span class="n">xhrPost</span><span class="p">({</span>
+ <span class="n">url</span><span class="p">:</span><span class="s">'index.php'</span><span class="p">,</span>
+ <span class="n">load</span><span class="p">:</span> <span class="n">JS_AJexampleCB</span><span class="p">,</span>
+ <span class="n">error</span><span class="p">:</span> <span class="n">errorHandler</span><span class="p">,</span>
+ <span class="n">content</span><span class="p">:</span> <span class="p">{</span><span class="n">continuation</span><span class="p">:</span> <span class="n">contid</span><span class="p">},</span>
+ <span class="n">timeout</span><span class="p">:</span> 15000
<span class="p">});</span>
<span class="p">}</span>
-<span class="n">function</span> <span class="n">JS_AJexampleCB</span><span class="p">(</span><span class="n">data</span><span class="p">,</span> <span class="n">ioArgs</span><span class="p">)</span> <span class="p">{</span>
- <span class="nb">eval</span><span class="p">(</span><span class="n">data</span><span class="p">);</span>
+<span class="k">function</span><span class="w"> </span><span class="nf">JS_AJexampleCB</span><span class="p">(</span>data, ioArgs<span class="p">)</span><span class="w"> </span><span class="p">{</span>
+ <span class="n">eval</span><span class="p">(</span><span class="n">data</span><span class="p">);</span>
<span class="p">}</span>
</pre></div>
<p>Then, we need to add a few things to states.php:</p>
<p>to the $actions array:</p>
-<div class="codehilite"><pre><span class="nv">$actions</span><span class="p">[</span><span class="s">'mode'</span><span class="p">][</span><span class="s">'AJexample'</span><span class="p">]</span> <span class="o">=</span> <span class="s">"exampleFunc2"</span><span class="p">;</span>
-<span class="nv">$actions</span><span class="p">[</span><span class="s">'pages'</span><span class="p">][</span><span class="s">'AJexample'</span><span class="p">]</span> <span class="o">=</span> <span class="s">"exampleSection"</span><span class="p">;</span>
+<div class="codehilite"><pre>$<span class="n">actions</span><span class="p">[</span><span class="s">'mode'</span><span class="p">][</span><span class="s">'AJexample'</span><span class="p">]</span> <span class="p">=</span> "<span class="n">exampleFunc2</span>"<span class="p">;</span>
+$<span class="n">actions</span><span class="p">[</span><span class="s">'pages'</span><span class="p">][</span><span class="s">'AJexample'</span><span class="p">]</span> <span class="p">=</span> "<span class="n">exampleSection</span>"<span class="p">;</span>
</pre></div>
@@ -231,8 +231,8 @@ print "update<span class="nt"></
<p>Now, we need to create exampleFunc2 (in examples.php):</p>
-<div class="codehilite"><pre><span class="n">function</span> <span class="n">exampleFunc2</span><span class="p">()</span> <span class="p">{</span>
- <span class="k">print</span> <span class="s">"document.getElementById('examplediv').innerHTML = 'Dynamic update';"</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="k">function</span><span class="w"> </span><span class="nf">exampleFunc2</span><span class="p">()</span><span class="w"> </span><span class="p">{</span>
+ <span class="n">print</span> "<span class="n">document</span><span class="p">.</span><span class="n">getElementById</span><span class="p">(</span><span class="s">'examplediv'</span><span class="p">).</span><span class="n">innerHTML</span> <span class="p">=</span> <span class="s">'Dynamic update'</span><span class="p">;</span>"<span class="p">;</span>
<span class="p">}</span>
</pre></div>
@@ -243,8 +243,8 @@ print "update<span class="nt"></
<span class="k">case</span> <span class="s">'submitAddGroup'</span><span class="p">:</span>
<span class="k">case</span> <span class="s">'submitDeleteGroup'</span><span class="p">:</span>
<span class="k">case</span> <span class="s">'examplemode'</span><span class="p">:</span>
- <span class="nv">$dojoRequires</span> <span class="o">=</span> <span class="n">array</span><span class="p">(</span><span class="s">'dojo.parser'</span><span class="p">);</span>
- <span class="n">break</span><span class="p">;</span>
+ $<span class="n">dojoRequires</span> <span class="p">=</span> <span class="n">array</span><span class="p">(</span><span class="s">'dojo.parser'</span><span class="p">);</span>
+ <span class="k">break</span><span class="p">;</span>
</pre></div>
@@ -254,46 +254,46 @@ print "update<span class="nt"></
<span class="k">case</span> <span class="s">'submitAddGroup'</span><span class="p">:</span>
<span class="k">case</span> <span class="s">'submitDeleteGroup'</span><span class="p">:</span>
<span class="k">case</span> <span class="s">'examplemode'</span><span class="p">:</span>
- <span class="nv">$rt</span> <span class="o">.=</span> <span class="s">"<style type=\"text/css\">\n"</span><span class="p">;</span>
+ $<span class="n">rt</span> <span class="p">.=</span> "<span class="o"><</span><span class="n">style</span> <span class="n">type</span><span class="p">=</span><span class="o">\</span>"<span class="n">text</span><span class="o">/</span><span class="n">css</span><span class="o">\</span>"<span class="o">>\</span><span class="n">n</span>"<span class="p">;</span>
</pre></div>
<p>Since we modified code.js, to test this, you will need to hold Shift and click the reload button in your browser to force your browser to reload code.js. "Click to update" will not show up as a normal link, but it should still be clickable. You can use CSS to make it look like a normal link or give it an href="#" if you want.</p>
<h2 id="a-word-about-using-tabs-for-code-indentation">A word about using tabs for code indentation</h2>
<p>All of the code has been indented using tabs (rather than spaces) except where code wraps to more than one line, in which case a combination of tabs and spaces are used. This allows someone editing the code to set his tab width to whatever he prefers, but still allows code that wraps to multiple lines to line up correctly. To do this, when you want to wrap code to another line, put a newline at the end of the one you are on just as you normally would. Next, tab over from the beginning of the line until you are even with where the initial line of code started, then use spaces to line up this line with something in the line above it that makes sense. I'll give an example. Almost all of the queries are written on multiple lines like this:</p>
-<div class="codehilite"><pre><span class="o">=====------------------------------</span>
- <span class="nv">$query</span> <span class="o">=</span> <span class="s">"SELECT id, "</span>
- <span class="o">.</span> <span class="s">"name, "</span>
- <span class="o">.</span> <span class="s">"prettyname "</span>
- <span class="o">.</span> <span class="s">"FROM image "</span>
- <span class="o">.</span> <span class="s">"WHERE id < 400 AND "</span>
- <span class="o">.</span> <span class="s">"OSid = 3"</span><span class="p">;</span>
-<span class="o">=====------------------------------</span>
+<div class="codehilite"><pre><span class="o">====</span><span class="p">=</span><span class="o">------------------------------</span>
+ $<span class="n">query</span> <span class="p">=</span> "<span class="n">SELECT</span> <span class="n">id</span><span class="p">,</span> "
+ <span class="p">.</span> "<span class="n">name</span><span class="p">,</span> "
+ <span class="p">.</span> "<span class="n">prettyname</span> "
+ <span class="p">.</span> "<span class="n">FROM</span> <span class="n">image</span> "
+ <span class="p">.</span> "<span class="n">WHERE</span> <span class="n">id</span> <span class="o"><</span> 400 <span class="n">AND</span> "
+ <span class="p">.</span> "<span class="n">OSid</span> <span class="p">=</span> 3"<span class="p">;</span>
+<span class="o">====</span><span class="p">=</span><span class="o">------------------------------</span>
</pre></div>
<p>In this example, whitespace indicated by the = marks should be made of tabs, whitespace indicated by the - marks should be made of spaces.</p>
<h2 id="inline-code-documentation">Inline Code Documentation</h2>
<p>Online documentation of the code is generated using Doxygen. Each file that should be parsed to generate docs needs to have the following toward the top of it:</p>
-<div class="codehilite"><pre><span class="o">/**</span>
- <span class="o">*</span> <span class="o">\</span><span class="n">file</span>
- <span class="o">*/</span>
+<div class="codehilite"><pre><span class="cm">/**</span>
+<span class="cm"> * \file</span>
+<span class="cm"> */</span>
</pre></div>
<p>All functions should have a header above them that documents what it does. The header should include the name of the function, a description of any parameters passed in, a description of anything returned, and a brief description of what the function does. The format of the header is:</p>
-<div class="codehilite"><pre><span class="sr">////////////////////////////////////////////////////////////////////</span><span class="o">/</span>
-<span class="sr">//</span><span class="o">/</span>
-<span class="sr">//</span><span class="o">/</span> <span class="o">\</span><span class="n">fn</span> <span class="n">nameOfFunction</span><span class="p">(</span><span class="nv">$param1</span><span class="p">,</span> <span class="nv">$param2</span><span class="p">)</span>
-<span class="sr">//</span><span class="o">/</span>
-<span class="sr">//</span><span class="o">/</span> <span class="o">\</span><span class="n">param</span> <span class="nv">$param1</span> <span class="o">-</span> <span class="n">description</span> <span class="n">of</span> <span class="n">param1</span>
-<span class="sr">//</span><span class="o">/</span> <span class="o">\</span><span class="n">param</span> <span class="nv">$param2</span> <span class="o">-</span> <span class="n">description</span> <span class="n">of</span> <span class="n">param2</span>
-<span class="sr">//</span><span class="o">/</span>
-<span class="sr">//</span><span class="o">/</span> <span class="o">\</span><span class="k">return</span> <span class="n">description</span> <span class="n">of</span> <span class="n">datastructure</span> <span class="n">returned</span>
-<span class="sr">//</span><span class="o">/</span>
-<span class="sr">//</span><span class="o">/</span> <span class="o">\</span><span class="n">brief</span> <span class="n">short</span> <span class="n">description</span> <span class="n">of</span> <span class="n">what</span> <span class="n">the</span> <span class="n">function</span> <span class="n">does</span>
-<span class="sr">//</span><span class="o">/</span>
-<span class="sr">////////////////////////////////////////////////////////////////////</span><span class="o">/</span>
+<div class="codehilite"><pre><span class="c1">/////////////////////////////////////////////////////////////////////</span>
+<span class="c1">///</span>
+<span class="c1">/// \fn nameOfFunction($param1, $param2)</span>
+<span class="c1">///</span>
+<span class="c1">/// \param $param1 - description of param1</span>
+<span class="c1">/// \param $param2 - description of param2</span>
+<span class="c1">///</span>
+<span class="c1">/// \return description of datastructure returned</span>
+<span class="c1">///</span>
+<span class="c1">/// \brief short description of what the function does</span>
+<span class="c1">///</span>
+<span class="c1">/////////////////////////////////////////////////////////////////////</span>
</pre></div>
Modified: websites/staging/vcl/trunk/content/docs/Addhoststodhcp.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/Addhoststodhcp.html (original)
+++ websites/staging/vcl/trunk/content/docs/Addhoststodhcp.html Fri Feb 13 19:07:47 2015
@@ -80,8 +80,7 @@ they will correctly be assigned their pr
<li>Select the All VM Computers group in the list at the top</li>
<li>Select the Computer Utilities radio button</li>
<li>Click Submit</li>
-<li>Click the Check All link at the bottom of the table<br />
-</li>
+<li>Click the Check All link at the bottom of the table </li>
<li>Next to "For selected computers, generate computer data for", select "dhcpd"</li>
<li>Click Generate Data</li>
<li>Enter the private IP address for your management node</li>
Modified: websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.2.2.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.2.2.html (original)
+++ websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.2.2.html Fri Feb 13 19:07:47 2015
@@ -90,14 +90,14 @@ other versions.</p>
page to download and verify apache-VCL-2.2.2.tar.bz2 and put in in /root</li>
<li>
<p><strong>extract VCL 2.2.2 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.2.2</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">bz2</span>
+<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>2<span class="p">.</span>2<span class="p">.</span>2<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">bz2</span>
</pre></div>
</li>
<li>
<p><strong>Shutdown</strong> the httpd service</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>
+<div class="codehilite"><pre><span class="n">service</span> <span class="n">httpd</span> <span class="n">stop</span> <span class="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">httpd</span> <span class="n">stop</span>
</pre></div>
@@ -106,7 +106,7 @@ page to download and verify apache-VCL-2
<p>We will <strong>create a backup of the vcl database</strong>. This will provide a restore point
if necessary. There are no updates to the database in this upgrade, but it is still a
good idea to have a backup.</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">.2.2</span><span class="o">-</span><span class="n">upgrade</span><span class="o">.</span><span class="n">sql</span>
+<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="p">.</span>2<span class="p">.</span>2<span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sql</span>
</pre></div>
@@ -116,24 +116,24 @@ good idea to have a backup.</p>
way so we can copy in the new web code base. 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>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">/</span><span class="n">var</span><span class="o">/</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="p">.</span>2<span class="p">.</span>1<span class="n">_web</span>
</pre></div>
</li>
<li>
<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.2.2</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>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">/</span><span class="n">root</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>2<span class="p">.</span>2
+<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="n">web</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span>
</pre></div>
</li>
<li>
<p><strong>Copy your 2.2.1 config files</strong></p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="o">~</span><span class="sr">/vcl_2.2.1_web/</span><span class="o">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
-<span class="n">cp</span> <span class="n">conf</span><span class="o">.</span><span class="n">php</span> <span class="n">secrets</span><span class="o">.</span><span class="n">php</span> <span class="n">pubkey</span><span class="o">.</span><span class="n">pem</span> <span class="nb">keys</span><span class="o">.</span><span class="n">pem</span> <span class="sr">/var/</span><span class="n">www</span><span class="sr">/html/</span><span class="n">vcl</span><span class="o">/.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">~/</span><span class="n">vcl_2</span><span class="p">.</span>2<span class="p">.</span>1<span class="n">_web</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
+<span class="n">cp</span> <span class="n">conf</span><span class="p">.</span><span class="n">php</span> <span class="n">secrets</span><span class="p">.</span><span class="n">php</span> <span class="n">pubkey</span><span class="p">.</span><span class="n">pem</span> <span class="n">keys</span><span class="p">.</span><span class="n">pem</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
</pre></div>
@@ -141,14 +141,15 @@ vcl web code at /var/www/html/vcl. If yo
<li>
<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 the below command 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>
+<div class="codehilite"><pre><span class="n">chown</span> <span class="n">apache</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span><span class="o">/</span><span class="n">maintenance</span>
</pre></div>
</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="p">:::</span><span class="n">BashLexer</span>
+ <span class="n">service</span> <span class="n">httpd</span> <span class="n">start</span> <span class="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">httpd</span> <span class="n">start</span>
</pre></div>
@@ -156,7 +157,8 @@ the apache user. If using a different us
<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="p">:::</span><span class="n">BashLexer</span>
+ <span class="n">tail</span> <span class="o">-</span><span class="n">f</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="nb">log</span><span class="o">/</span><span class="n">vcld</span><span class="p">.</span><span class="nb">log</span>
</pre></div>
Modified: websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.1.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.1.html (original)
+++ websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.1.html Fri Feb 13 19:07:47 2015
@@ -89,22 +89,22 @@ from 2.2.1 to 2.3.1, this may or may not
<li>follow instructions on VCL 2.3.1 Release page to download and verify apache-VCL-2.3.1.tar.bz2 and put in in /root</li>
<li>
<p><strong>extract VCL 2.3.1 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.1</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">bz2</span>
+<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>2<span class="p">.</span>3<span class="p">.</span>1<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">bz2</span>
</pre></div>
</li>
<li>
<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>
+<div class="codehilite"><pre><span class="n">service</span> <span class="n">httpd</span> <span class="n">stop</span> <span class="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</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="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">vcld</span> <span class="n">stop</span>
</pre></div>
</li>
<li>
<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.1</span><span class="o">-</span><span class="n">upgrade</span><span class="o">.</span><span class="n">sql</span>
+<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="p">.</span>3<span class="p">.</span>1<span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sql</span>
</pre></div>
@@ -115,8 +115,8 @@ Access to manage the group is added to t
need to add it manually after starting httpd again. To add it manually, pick a node in the privilege tree, scroll to
Resources, click Add Resource Group, select serverprofile/all profiles from the drop-down box, check available,
administer, manageGroup, and manageMapping, and click Submit New Resource Group.</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.1</span>
-<span class="n">mysql</span> <span class="n">vcl</span> <span class="o"><</span> <span class="n">mysql</span><span class="o">/</span><span class="n">update</span><span class="o">-</span><span class="n">vcl</span><span class="o">.</span><span class="n">sql</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">/</span><span class="n">root</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>3<span class="p">.</span>1
+<span class="n">mysql</span> <span class="n">vcl</span> <span class="o"><</span> <span class="n">mysql</span><span class="o">/</span><span class="n">update</span><span class="o">-</span><span class="n">vcl</span><span class="p">.</span><span class="n">sql</span>
</pre></div>
@@ -125,24 +125,24 @@ administer, manageGroup, and manageMappi
<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>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">/</span><span class="n">var</span><span class="o">/</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="p">.</span>2<span class="p">.</span>1<span class="n">_web</span>
</pre></div>
</li>
<li>
<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.1</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>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">/</span><span class="n">root</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>3<span class="p">.</span>1
+<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="n">web</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span>
</pre></div>
</li>
<li>
<p><strong>Copy your 2.2.1 config files</strong></p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="o">~</span><span class="sr">/vcl_2.2.1_web/</span><span class="o">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
-<span class="n">cp</span> <span class="n">conf</span><span class="o">.</span><span class="n">php</span> <span class="n">secrets</span><span class="o">.</span><span class="n">php</span> <span class="n">pubkey</span><span class="o">.</span><span class="n">pem</span> <span class="nb">keys</span><span class="o">.</span><span class="n">pem</span> <span class="sr">/var/</span><span class="n">www</span><span class="sr">/html/</span><span class="n">vcl</span><span class="o">/.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">~/</span><span class="n">vcl_2</span><span class="p">.</span>2<span class="p">.</span>1<span class="n">_web</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
+<span class="n">cp</span> <span class="n">conf</span><span class="p">.</span><span class="n">php</span> <span class="n">secrets</span><span class="p">.</span><span class="n">php</span> <span class="n">pubkey</span><span class="p">.</span><span class="n">pem</span> <span class="n">keys</span><span class="p">.</span><span class="n">pem</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
</pre></div>
@@ -150,7 +150,7 @@ that you installed the vcl web code at /
<li>
<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>
+<div class="codehilite"><pre><span class="n">chown</span> <span class="n">apache</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span><span class="o">/</span><span class="n">maintenance</span>
</pre></div>
@@ -162,21 +162,21 @@ a different user change below cmd accord
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="n">blockNotifyUsers</span>
</pre></div>
<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="n">userlookupUsers</span>
</pre></div>
<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="n">DEFAULTLOCALE</span>"<span class="p">,</span> "<span class="n">en_US</span>"<span class="p">);</span>
</pre></div>
@@ -184,7 +184,7 @@ look in /var/www/html/vcl/locale to see
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="n">ALLOWADDSHIBUSERS</span>"<span class="p">,</span> 0<span class="p">);</span>
</pre></div>
@@ -194,8 +194,8 @@ user and use that when doing the bind th
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="n">lookupuserbeforeauth</span>" <span class="p">=</span><span class="o">></span> 0<span class="p">,</span>
+"<span class="n">lookupuserfield</span>" <span class="p">=</span><span class="o">></span> <span class="s">''</span><span class="p">,</span>
</pre></div>
@@ -203,16 +203,16 @@ the following to each LDAP</strong> arra
<ul>
<li>
<p>OLD</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 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>
+<div class="codehilite"><pre>$<span class="n">addUserFunc</span><span class="p">[</span>$<span class="n">item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="p">=</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="n">updateUserFunc</span><span class="p">[</span>$<span class="n">item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="p">=</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>
</pre></div>
</li>
<li>
<p>NEW</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>
+<div class="codehilite"><pre>$<span class="n">addUserFunc</span><span class="p">[</span>$<span class="n">item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="p">=</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="n">updateUserFunc</span><span class="p">[</span>$<span class="n">item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="p">=</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>
@@ -223,7 +223,7 @@ the following to each LDAP</strong> arra
</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="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">httpd</span> <span class="n">start</span>
</pre></div>
@@ -232,36 +232,36 @@ the following to each LDAP</strong> arra
<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>
+<span class="n">ie</span><span class="p">.</span> <span class="n">cd</span> <span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">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="p">.</span>2<span class="p">.</span>1<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="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">/</span><span class="n">root</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>3<span class="p">.</span>1<span class="o">/</span><span class="n">managementnode</span><span class="o">/*</span> <span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">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="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">install_perl_libs</span><span class="p">.</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="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</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="o">/</span><span class="n">var</span><span class="o">/</span><span class="nb">log</span><span class="o">/</span><span class="n">vcld</span><span class="p">.</span><span class="nb">log</span>
</pre></div>
Modified: websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.2.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.2.html (original)
+++ websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2.1to2.3.2.html Fri Feb 13 19:07:47 2015
@@ -90,22 +90,22 @@ from 2.2.1 to 2.3.2, this may or may not
page to download and verify apache-VCL-2.3.2.tar.bz2 and put in in /root</li>
<li>
<p><strong>extract VCL 2.3.2 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.2</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">bz2</span>
+<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>2<span class="p">.</span>3<span class="p">.</span>2<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">bz2</span>
</pre></div>
</li>
<li>
<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>
+<div class="codehilite"><pre><span class="n">service</span> <span class="n">httpd</span> <span class="n">stop</span> <span class="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</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="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">vcld</span> <span class="n">stop</span>
</pre></div>
</li>
<li>
<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.2</span><span class="o">-</span><span class="n">upgrade</span><span class="o">.</span><span class="n">sql</span>
+<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="p">.</span>3<span class="p">.</span>2<span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sql</span>
</pre></div>
@@ -116,8 +116,8 @@ Access to manage the group is added to t
need to add it manually after starting httpd again. To add it manually, pick a node in the privilege tree, scroll to
Resources, click Add Resource Group, select serverprofile/all profiles from the drop-down box, check available,
administer, manageGroup, and manageMapping, and click Submit New Resource Group.</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.2</span>
-<span class="n">mysql</span> <span class="n">vcl</span> <span class="o"><</span> <span class="n">mysql</span><span class="o">/</span><span class="n">update</span><span class="o">-</span><span class="n">vcl</span><span class="o">.</span><span class="n">sql</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">/</span><span class="n">root</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>3<span class="p">.</span>2
+<span class="n">mysql</span> <span class="n">vcl</span> <span class="o"><</span> <span class="n">mysql</span><span class="o">/</span><span class="n">update</span><span class="o">-</span><span class="n">vcl</span><span class="p">.</span><span class="n">sql</span>
</pre></div>
@@ -126,24 +126,24 @@ administer, manageGroup, and manageMappi
<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>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">/</span><span class="n">var</span><span class="o">/</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="p">.</span>2<span class="p">.</span>1<span class="n">_web</span>
</pre></div>
</li>
<li>
<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.2</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>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">/</span><span class="n">root</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>3<span class="p">.</span>2
+<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="n">web</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span>
</pre></div>
</li>
<li>
<p><strong>Copy your 2.2.1 config files</strong></p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="o">~</span><span class="sr">/vcl_2.2.1_web/</span><span class="o">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
-<span class="n">cp</span> <span class="n">conf</span><span class="o">.</span><span class="n">php</span> <span class="n">secrets</span><span class="o">.</span><span class="n">php</span> <span class="n">pubkey</span><span class="o">.</span><span class="n">pem</span> <span class="nb">keys</span><span class="o">.</span><span class="n">pem</span> <span class="sr">/var/</span><span class="n">www</span><span class="sr">/html/</span><span class="n">vcl</span><span class="o">/.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="o">~/</span><span class="n">vcl_2</span><span class="p">.</span>2<span class="p">.</span>1<span class="n">_web</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
+<span class="n">cp</span> <span class="n">conf</span><span class="p">.</span><span class="n">php</span> <span class="n">secrets</span><span class="p">.</span><span class="n">php</span> <span class="n">pubkey</span><span class="p">.</span><span class="n">pem</span> <span class="n">keys</span><span class="p">.</span><span class="n">pem</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
</pre></div>
@@ -151,7 +151,7 @@ that you installed the vcl web code at /
<li>
<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>
+<div class="codehilite"><pre><span class="n">chown</span> <span class="n">apache</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">html</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span><span class="o">/</span><span class="n">maintenance</span>
</pre></div>
@@ -163,21 +163,21 @@ a different user change below cmd accord
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="n">blockNotifyUsers</span>
</pre></div>
<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="n">userlookupUsers</span>
</pre></div>
<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="n">DEFAULTLOCALE</span>"<span class="p">,</span> "<span class="n">en_US</span>"<span class="p">);</span>
</pre></div>
@@ -185,7 +185,7 @@ look in /var/www/html/vcl/locale to see
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="n">ALLOWADDSHIBUSERS</span>"<span class="p">,</span> 0<span class="p">);</span>
</pre></div>
@@ -195,8 +195,8 @@ user and use that when doing the bind th
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="n">lookupuserbeforeauth</span>" <span class="p">=</span><span class="o">></span> 0<span class="p">,</span>
+"<span class="n">lookupuserfield</span>" <span class="p">=</span><span class="o">></span> <span class="s">''</span><span class="p">,</span>
</pre></div>
@@ -204,16 +204,16 @@ the following to each LDAP</strong> arra
<ul>
<li>
<p>OLD</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 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>
+<div class="codehilite"><pre>$<span class="n">addUserFunc</span><span class="p">[</span>$<span class="n">item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="p">=</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="n">updateUserFunc</span><span class="p">[</span>$<span class="n">item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="p">=</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>
</pre></div>
</li>
<li>
<p>NEW</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>
+<div class="codehilite"><pre>$<span class="n">addUserFunc</span><span class="p">[</span>$<span class="n">item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="p">=</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="n">updateUserFunc</span><span class="p">[</span>$<span class="n">item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="p">=</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>
@@ -224,7 +224,7 @@ the following to each LDAP</strong> arra
</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="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</span><span class="n">d</span><span class="o">/</span><span class="n">httpd</span> <span class="n">start</span>
</pre></div>
@@ -233,36 +233,36 @@ the following to each LDAP</strong> arra
<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>
+<span class="n">ie</span><span class="p">.</span> <span class="n">cd</span> <span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">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="p">.</span>2<span class="p">.</span>1<span class="n">_managementnode</span>
</pre></div>
</li>
<li>
<p><strong>Copy in the 2.3.2 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.2</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="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">/</span><span class="n">root</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>3<span class="p">.</span>2<span class="o">/</span><span class="n">managementnode</span><span class="o">/*</span> <span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">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="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">install_perl_libs</span><span class="p">.</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="n">or</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">init</span><span class="p">.</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="o">/</span><span class="n">var</span><span class="o">/</span><span class="nb">log</span><span class="o">/</span><span class="n">vcld</span><span class="p">.</span><span class="nb">log</span>
</pre></div>