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 [4/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/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 Fri Feb 13 19:07:47 2015
@@ -88,68 +88,68 @@
<li>follow instructions on VCL 2.3 Release page to download and verify apache-VCL-2.3.tar.bz2 and put in in /root</li>
<li>
<p><strong>extract VCL 2.3 code</strong></p>
-<div class="codehilite"><pre><span class="n">tar</span> <span class="n">xjf</span> <span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span><span class="mf">2.3</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">bz2</span>
+<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><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</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="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sql</span>
</pre></div>
</li>
<li>
<p>This step <strong>updates the mysql schema</strong>. <em>Note</em>: A new resource group is added in update-vcl.sql - <strong>all profiles</strong>. Access to manage the group is added to the VCL->admin node in the privilege tree if that node exists. If not, you will 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</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="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>
</li>
<li>
<p>If you want to use libvirt provisioning for KVM, you need to add one entry to the database that was left out of the release.</p>
-<div class="codehilite"><pre><span class="n">echo</span> <span class="s">"INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid) SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE provisioning.name = 'libvirt' AND OSinstalltype.name = 'vmware';"</span> <span class="o">|</span> <span class="n">mysql</span> <span class="n">vcl</span>
+<div class="codehilite"><pre><span class="n">echo</span> "<span class="n">INSERT</span> <span class="n">IGNORE</span> <span class="n">provisioningOSinstalltype</span> <span class="p">(</span><span class="n">provisioningid</span><span class="p">,</span> <span class="n">OSinstalltypeid</span><span class="p">)</span> <span class="n">SELECT</span> <span class="n">provisioning</span><span class="p">.</span><span class="n">id</span><span class="p">,</span> <span class="n">OSinstalltype</span><span class="p">.</span><span class="n">id</span> <span class="n">FROM</span> <span class="n">provisioning</span><span class="p">,</span> <span class="n">OSinstalltype</span> <span class="n">WHERE</span> <span class="n">provisioning</span><span class="p">.</span><span class="n">name</span> <span class="p">=</span> <span class="s">'libvirt'</span> <span class="n">AND</span> <span class="n">OSinstalltype</span><span class="p">.</span><span class="n">name</span> <span class="p">=</span> <spa
n class="s">'vmware'</span><span class="p">;</span>" <span class="o">|</span> <span class="n">mysql</span> <span class="n">vcl</span>
</pre></div>
</li>
<li>
<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</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="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>
</li>
<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>
@@ -157,83 +157,95 @@
<li>
<p><strong>Make changes to conf.php</strong>:</p>
<p>a. A new user group permission that controls who can manage block allocations globally or for a specific affiliation 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="p">:::</span><span class="n">BashLexer</span>
+ $<span class="n">blockNotifyUsers</span>
</pre></div>
<p>b. A new user group permission that controls who can look up users globally or for a specific affiliation has been 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="p">:::</span><span class="n">BashLexer</span>
+ $<span class="n">userlookupUsers</span>
</pre></div>
<p>c. <strong>Multilingualization</strong> has been added VCL. So, <strong>DEFAULTLOCALE</strong> has been added to conf.php to set the default 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="p">:::</span><span class="n">BashLexer</span>
+ <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>
<p>d. Users authenticated using Shibboleth without also having an LDAP server can now be added before they log in. <strong>Add the following to conf.php</strong> If you are using Shibboleth and would like to be able to add users to groups before the user has ever logged in to VCL, you can set this to 1. However, please note that if you typo the userid, there is no way to verify it, and the user will be added with the typoed userid.</p>
-<div class="codehilite"><pre> <span class="n">define</span><span class="p">(</span><span class="s">"ALLOWADDSHIBUSERS"</span><span class="p">,</span> <span class="mi">0</span><span class="p">);</span>
+<div class="codehilite"><pre> <span class="p">:::</span><span class="n">BashLexer</span>
+ <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>
<p>e. LDAP related items have been simplified in the code using additional options in $authMechs. For any LDAP entries, add two options. "lookupuserbeforeauth" is used if you need VCL to look up the full DN of a user and use that when doing the bind that authenticates the user (if you don't know what this means, leave it set to 0). If you need to set it to 1, then you will need to set "lookupuserfield" to what LDAP attribute to use when looking up the user's DN (typically either 'cn', 'uid', or 'samaccountname'). In conf.php, <strong>Add the following to each LDAP</strong> array you have in the $authMech array.</p>
-<div class="codehilite"><pre> <span class="s">"lookupuserbeforeauth"</span> <span class="o">=></span> <span class="mi">0</span><span class="p">,</span>
- <span class="s">"lookupuserfield"</span> <span class="o">=></span> <span class="s">''</span><span class="p">,</span>
+<div class="codehilite"><pre> <span class="p">:::</span><span class="n">BashLexer</span>
+ "<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>
<p>f. If you are using any Local accounts for authentication, you need to modify the entries for $addUserFunc and $updateUserFunc. Change</p>
-<div class="codehilite"><pre> <span class="n">OLD</span>
- <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return 0;'</span><span class="p">);</span>
- <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return 0;'</span><span class="p">);</span>
+<div class="codehilite"><pre> <span class="p">:::</span><span class="n">BashLexer</span>
+ <span class="n">OLD</span>
+ $<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>
<span class="n">NEW</span>
- <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return NULL;'</span><span class="p">);</span>
- <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return NULL;'</span><span class="p">);</span>
+ $<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>
</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>
</li>
<li>
<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>
+<div class="codehilite"><pre> <span class="p">:::</span><span class="n">BashLexer</span>
+ <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="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 code base to /usr/local</strong>, copying in should preserve any drivers or other files you've added.</p>
-<div class="codehilite"><pre> <span class="sr">/bin/c</span><span class="n">p</span> <span class="o">-</span><span class="n">r</span> <span class="sr">/root/</span><span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span><span class="mf">2.3</span><span class="sr">/managementnode/</span><span class="o">*</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="o">/</span><span class="n">vcl</span>
+<div class="codehilite"><pre> <span class="p">:::</span><span class="n">BashLexer</span>
+ <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="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="p">:::</span><span class="n">BashLexer</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><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="p">:::</span><span class="n">BashLexer</span>
+ <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="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.2to2.2.2.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.2.2.html (original)
+++ websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.2.2.html Fri Feb 13 19:07:47 2015
@@ -96,15 +96,15 @@ page to download and verify apache-VCL-2
</li>
<li>
<p>extract VCL 2.2.2 code</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>
-<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>
@@ -113,15 +113,15 @@ 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>
</li>
<li>
<p>This step <strong>updates the mysql schema</strong>.</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">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>2<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>
@@ -135,16 +135,16 @@ permission. Look at the secrets.php file
For example, if your web code is installed at /var/www/html/vcl, your secrets.php
file would be /var/www/html/vcl/.ht-inc/secrets.php. Look for $vclhost and
$vclusername. The secrets.php file might have something like:</p>
-<div class="codehilite"><pre><span class="nv">$vclhost</span> <span class="o">=</span> <span class="s">'localhost'</span><span class="p">;</span>
-<span class="nv">$vcluser</span> <span class="o">=</span> <span class="s">'vcluser'</span><span class="p">;</span>
+<div class="codehilite"><pre>$<span class="n">vclhost</span> <span class="p">=</span> <span class="s">'localhost'</span><span class="p">;</span>
+$<span class="n">vcluser</span> <span class="p">=</span> <span class="s">'vcluser'</span><span class="p">;</span>
</pre></div>
<p>Then, you need to issue the grant command to mysql. Using the values from above
as examples, connect to mysql and then issue the grant command:</p>
<div class="codehilite"><pre><span class="n">mysql</span>
-<span class="n">GRANT</span> <span class="n">CREATE</span> <span class="n">TEMPORARY</span> <span class="n">TABLES</span> <span class="n">ON</span> <span class="sb">`vcl`</span><span class="o">.*</span> <span class="n">TO</span> <span class="s">'vcluser'</span><span class="nv">@</span><span class="err">'</span><span class="nv">localhost</span><span class="err">'</span><span class="p">;</span>
-<span class="nb">exit</span>
+<span class="n">GRANT</span> <span class="n">CREATE</span> <span class="n">TEMPORARY</span> <span class="n">TABLES</span> <span class="n">ON</span> `<span class="n">vcl</span>`<span class="o">.*</span> <span class="n">TO</span> <span class="s">'vcluser'</span><span class="p">@</span><span class="s">'localhost'</span><span class="p">;</span>
+<span class="n">exit</span>
</pre></div>
@@ -155,24 +155,24 @@ of the way, so we can copy in the new we
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_</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="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 config files</strong></p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="o">~</span><span class="sr">/vcl_2.2_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="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>
@@ -180,7 +180,7 @@ elsewhere, replace /var/www/html/vcl wit
<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>
@@ -193,7 +193,7 @@ globally or for a specific affiliation h
user group under Privileges->Additional User Permissions->Manage Block Allocations.
Users with this permission are notified of new block allocation requests.
<b>Remove the following from conf.php</b>.</p>
-<div class="codehilite"><pre><span class="nv">$blockNotifyUsers</span>
+<div class="codehilite"><pre>$<span class="n">blockNotifyUsers</span>
</pre></div>
@@ -203,7 +203,7 @@ or for a specific affiliation has been a
under Privileges->Additional User Permissions->User Lookup. Users with this
permission can look up information about other users.
<b>Remove the following from conf.php</b>.</p>
-<div class="codehilite"><pre><span class="nv">$userlookupUsers</span>
+<div class="codehilite"><pre>$<span class="n">userlookupUsers</span>
</pre></div>
@@ -212,7 +212,7 @@ permission can look up information about
</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>
@@ -222,8 +222,8 @@ permission can look up information about
base and then copy the new code over the existing code to preserve any drivers or other
files you've added.</p>
<div class="codehilite"><pre><span class="n">cd</span> <span class="o"><</span><span class="n">your</span> <span class="n">vcl</span> <span class="n">MN</span> <span class="n">code</span> <span class="n">root</span> <span class="n">path</span><span class="o">></span>
-<span class="n">ie</span><span class="o">.</span> <span class="n">cd</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="o">/</span>
-<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="n">vcl</span> <span class="o">~/</span><span class="n">vcl_2</span><span class="mf">.2_</span><span class="n">managementnode</span>
+<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="n">_managementnode</span>
</pre></div>
@@ -231,21 +231,21 @@ files you've added.</p>
<li>
<p><strong>Copy in the 2.2.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.2.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>2<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>
@@ -253,7 +253,7 @@ or other files you've added.</p>
<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.2to2.3.1.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.1.html (original)
+++ websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.1.html Fri Feb 13 19:07:47 2015
@@ -90,22 +90,22 @@ this may or may not work for other versi
<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>
@@ -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.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>
@@ -128,8 +128,8 @@ The web code now requires access to crea
to access mysql the "CREATE TEMPORARY TABLES" permission. Look at the secrets.php file in your web code for the user
and hostname. For example, if your web code is installed at /var/www/html/vcl, your secrets.php file would be
/var/www/html/vcl/.ht-inc/secrets.php. Look for $vclhost and $vclusername. The secrets.php file might have something like:</p>
-<div class="codehilite"><pre><span class="nv">$vclhost</span> <span class="o">=</span> <span class="s">'localhost'</span><span class="p">;</span>
-<span class="nv">$vcluser</span> <span class="o">=</span> <span class="s">'vcluser'</span><span class="p">;</span>
+<div class="codehilite"><pre>$<span class="n">vclhost</span> <span class="p">=</span> <span class="s">'localhost'</span><span class="p">;</span>
+$<span class="n">vcluser</span> <span class="p">=</span> <span class="s">'vcluser'</span><span class="p">;</span>
</pre></div>
@@ -137,8 +137,8 @@ and hostname. For example, if your web c
<li>
<p>Then, you need to issue the grant command to mysql. Using the values from above as examples, connect to mysql and then issue the grant command:</p>
<div class="codehilite"><pre><span class="n">mysql</span>
-<span class="n">GRANT</span> <span class="n">CREATE</span> <span class="n">TEMPORARY</span> <span class="n">TABLES</span> <span class="n">ON</span> <span class="sb">`vcl`</span><span class="o">.*</span> <span class="n">TO</span> <span class="s">'vcluser'</span><span class="nv">@</span><span class="err">'</span><span class="nv">localhost</span><span class="err">'</span><span class="p">;</span>
-<span class="nb">exit</span>
+<span class="n">GRANT</span> <span class="n">CREATE</span> <span class="n">TEMPORARY</span> <span class="n">TABLES</span> <span class="n">ON</span> `<span class="n">vcl</span>`<span class="o">.*</span> <span class="n">TO</span> <span class="s">'vcluser'</span><span class="p">@</span><span class="s">'localhost'</span><span class="p">;</span>
+<span class="n">exit</span>
</pre></div>
@@ -148,24 +148,24 @@ and hostname. For example, if your web c
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_</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="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 config files</strong></p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="o">~</span><span class="sr">/vcl_2.2_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="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>
@@ -173,7 +173,7 @@ with your vcl web root.</p>
<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>
@@ -184,21 +184,21 @@ different user change below cmd accordin
<li>A new user group permission that controls who can manage block allocations globally or for a specific affiliation
has been added. It can be granted to any user group under Privileges->Additional User Permissions->Manage Block Allocations.
Users with this permission are notified of new block allocation requests. <strong>Remove the following from conf.php</strong>.</p>
-<div class="codehilite"><pre><span class="nv">$blockNotifyUsers</span>
+<div class="codehilite"><pre>$<span class="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>
@@ -206,7 +206,7 @@ locale. <strong>Add the following to con
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>
@@ -215,8 +215,8 @@ add two options. "lookupuserbeforeauth"
the bind that authenticates the user (if you don't know what this means, leave it set to 0). If you need to set it to 1,
then you will need to set "lookupuserfield" to what LDAP attribute to use when looking up the user's DN
(typically either 'cn', 'uid', or 'samaccountname'). In conf.php, <strong>Add the following to each LDAP</strong> array you have in the $authMech array.</p>
-<div class="codehilite"><pre><span class="s">"lookupuserbeforeauth"</span> <span class="o">=></span> <span class="mi">0</span><span class="p">,</span>
-<span class="s">"lookupuserfield"</span> <span class="o">=></span> <span class="s">''</span><span class="p">,</span>
+<div class="codehilite"><pre>"<span class="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>
@@ -224,37 +224,37 @@ then you will need to set "lookupuserfie
<ul>
<li>
<p>REMOVE</p>
-<div class="codehilite"><pre><span class="nv">$affilValFunc</span>
-<span class="nv">$affilValFuncArgs</span>
-<span class="nv">$addUserFunc</span>
-<span class="nv">$addUserFuncArgs</span>
-<span class="nv">$updateUserFunc</span>
-<span class="nv">$updateUserFuncArgs</span>
+<div class="codehilite"><pre>$<span class="n">affilValFunc</span>
+$<span class="n">affilValFuncArgs</span>
+$<span class="n">addUserFunc</span>
+$<span class="n">addUserFuncArgs</span>
+$<span class="n">updateUserFunc</span>
+$<span class="n">updateUserFuncArgs</span>
</pre></div>
</li>
<li>
<p>ADD</p>
-<div class="codehilite"><pre><span class="nv">$affilValFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$affilValFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$addUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$addUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$updateUserFunc</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="nv">$updateUserFuncArgs</span> <span class="o">=</span> <span class="n">array</span><span class="p">();</span>
-<span class="k">foreach</span><span class="p">(</span><span class="nv">$authMechs</span> <span class="n">as</span> <span class="nv">$key</span> <span class="o">=></span> <span class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
- <span class="k">if</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">'type'</span><span class="p">]</span> <span class="o">==</span> <span class="s">'ldap'</span><span class="p">)</span> <span class="p">{</span>
- <span class="nv">$affilValFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'validateLDAPUser'</span><span class="p">;</span>
- <span class="nv">$affilValFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
- <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'addLDAPUser'</span><span class="p">;</span>
- <span class="nv">$addUserFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
- <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="s">'updateLDAPUser'</span><span class="p">;</span>
- <span class="nv">$updateUserFuncArgs</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+<div class="codehilite"><pre>$<span class="n">affilValFunc</span> <span class="p">=</span> <span class="n">array</span><span class="p">();</span>
+$<span class="n">affilValFuncArgs</span> <span class="p">=</span> <span class="n">array</span><span class="p">();</span>
+$<span class="n">addUserFunc</span> <span class="p">=</span> <span class="n">array</span><span class="p">();</span>
+$<span class="n">addUserFuncArgs</span> <span class="p">=</span> <span class="n">array</span><span class="p">();</span>
+$<span class="n">updateUserFunc</span> <span class="p">=</span> <span class="n">array</span><span class="p">();</span>
+$<span class="n">updateUserFuncArgs</span> <span class="p">=</span> <span class="n">array</span><span class="p">();</span>
+<span class="n">foreach</span><span class="p">(</span>$<span class="n">authMechs</span> <span class="n">as</span> $<span class="n">key</span> <span class="p">=</span><span class="o">></span> $<span class="n">item</span><span class="p">)</span> <span class="p">{</span>
+ <span class="k">if</span><span class="p">(</span>$<span class="n">item</span><span class="p">[</span><span class="s">'type'</span><span class="p">]</span> <span class="o">==</span> <span class="s">'ldap'</span><span class="p">)</span> <span class="p">{</span>
+ $<span class="n">affilValFunc</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="s">'validateLDAPUser'</span><span class="p">;</span>
+ $<span class="n">affilValFuncArgs</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">key</span><span class="p">;</span>
+ $<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="s">'addLDAPUser'</span><span class="p">;</span>
+ $<span class="n">addUserFuncArgs</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">key</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="s">'updateLDAPUser'</span><span class="p">;</span>
+ $<span class="n">updateUserFuncArgs</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">key</span><span class="p">;</span>
<span class="p">}</span>
- <span class="n">elseif</span><span class="p">(</span><span class="nv">$item</span><span class="p">[</span><span class="s">'type'</span><span class="p">]</span> <span class="o">==</span> <span class="s">'local'</span><span class="p">)</span> <span class="p">{</span>
- <span class="nv">$affilValFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return 0;'</span><span class="p">);</span>
- <span class="nv">$addUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return NULL;'</span><span class="p">);</span>
- <span class="nv">$updateUserFunc</span><span class="p">[</span><span class="nv">$item</span><span class="p">[</span><span class="s">'affiliationid'</span><span class="p">]]</span> <span class="o">=</span> <span class="n">create_function</span><span class="p">(</span><span class="s">''</span><span class="p">,</span> <span class="s">'return NULL;'</span><span class="p">);</span>
+ <span class="k">elseif</span><span class="p">(</span>$<span class="n">item</span><span class="p">[</span><span class="s">'type'</span><span class="p">]</span> <span class="o">==</span> <span class="s">'local'</span><span class="p">)</span> <span class="p">{</span>
+ $<span class="n">affilValFunc</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">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>
<span class="p">}</span>
<span class="p">}</span>
</pre></div>
@@ -266,7 +266,7 @@ then you will need to set "lookupuserfie
</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>
@@ -275,36 +275,36 @@ then you will need to set "lookupuserfie
<p><strong>Update management node code</strong> This step will make a backup copy of the 2.2 vcl code base and then copy the new code
over the existing code to preserve any drivers or other files you've added.</p>
<div class="codehilite"><pre><span class="n">cd</span> <span class="o"><</span><span class="n">your</span> <span class="n">vcl</span> <span class="n">MN</span> <span class="n">code</span> <span class="n">root</span> <span class="n">path</span><span class="o">></span>
-<span class="n">ie</span><span class="o">.</span> <span class="n">cd</span> <span class="sr">/usr/</span><span class="nb">local</span><span class="o">/</span>
-<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="n">vcl</span> <span class="o">~/</span><span class="n">vcl_2</span><span class="mf">.2_</span><span class="n">managementnode</span>
+<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="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>