Author: buildbot
Date: Mon Oct 15 17:21:41 2012
New Revision: 835142
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 15 17:21:41 2012
@@ -1 +1 @@
-1398395
+1398400
Modified:
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html
==============================================================================
---
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html
(original)
+++
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.2to2.3.html
Mon Oct 15 17:21:41 2012
@@ -134,13 +134,12 @@ The web code now requires access to crea
</li>
<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>
+<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>
</pre></div>
-<p>mysql
- GRANT CREATE TEMPORARY TABLES ON <code>vcl</code>.* TO
'vcluser'@'localhost';
- exit</p>
</li>
<li>
<p><strong>Update the web code</strong>. This step we will move the 2.2 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>
@@ -202,40 +201,40 @@ The web code now requires access to crea
<p>f. The way the authentication functions toward the bottom of conf.php are
initialized has been simplified. Make the following changes:</p>
-<div class="codehilite"><pre> <span class="n">REMOVE</span>
+<div class="codehilite"><pre> <span class="o">**</span><span
class="n">REMOVE</span><span class="o">**</span>
- <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
- <span class="nv">$affilValFunc</span>
- <span class="nv">$affilValFuncArgs</span>
- <span class="nv">$addUserFunc</span>
- <span class="nv">$addUserFuncArgs</span>
- <span class="nv">$updateUserFunc</span>
- <span class="nv">$updateUserFuncArgs</span>
-
- <span class="n">ADD</span>
-
- <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
- <span class="nv">$affilValFunc</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
- <span class="nv">$affilValFuncArgs</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
- <span class="nv">$addUserFunc</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
- <span class="nv">$addUserFuncArgs</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
- <span class="nv">$updateUserFunc</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
- <span class="nv">$updateUserFuncArgs</span> <span
class="o">=</span> <span class="n">array</span><span class="p">();</span>
- <span class="k">foreach</span><span class="p">(</span><span
class="nv">$authMechs</span> <span class="n">as</span> <span
class="nv">$key</span> <span class="o">=></span> <span
class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
- <span class="k">if</span><span class="p">(</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'type'</span><span class="p">]</span> <span
class="o">==</span> <span class="s">'ldap'</span><span
class="p">)</span> <span class="p">{</span>
- <span class="nv">$affilValFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="s">'validateLDAPUser'</span><span
class="p">;</span>
- <span class="nv">$affilValFuncArgs</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
- <span class="nv">$addUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="s">'addLDAPUser'</span><span
class="p">;</span>
- <span class="nv">$addUserFuncArgs</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
- <span class="nv">$updateUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="s">'updateLDAPUser'</span><span
class="p">;</span>
- <span class="nv">$updateUserFuncArgs</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
- <span class="p">}</span>
- <span class="n">elseif</span><span class="p">(</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'type'</span><span class="p">]</span> <span
class="o">==</span> <span class="s">'local'</span><span
class="p">)</span> <span class="p">{</span>
- <span class="nv">$affilValFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return 0;'</span><span class="p">);</span>
- <span class="nv">$addUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return NULL;'</span><span class="p">);</span>
- <span class="nv">$updateUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return NULL;'</span><span class="p">);</span>
- <span class="p">}</span>
- <span class="p">}</span>
+ <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
+ <span class="nv">$affilValFunc</span>
+ <span class="nv">$affilValFuncArgs</span>
+ <span class="nv">$addUserFunc</span>
+ <span class="nv">$addUserFuncArgs</span>
+ <span class="nv">$updateUserFunc</span>
+ <span class="nv">$updateUserFuncArgs</span>
+
+ <span class="o">**</span><span class="n">ADD</span><span
class="o">**</span>
+
+ <span class="o">::</span><span class="p">:</span><span
class="n">BashLexer</span>
+ <span class="nv">$affilValFunc</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
+ <span class="nv">$affilValFuncArgs</span> <span
class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="nv">$addUserFunc</span> <span class="o">=</span>
<span class="n">array</span><span class="p">();</span>
+ <span class="nv">$addUserFuncArgs</span> <span
class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="nv">$updateUserFunc</span> <span
class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="nv">$updateUserFuncArgs</span> <span
class="o">=</span> <span class="n">array</span><span class="p">();</span>
+ <span class="k">foreach</span><span class="p">(</span><span
class="nv">$authMechs</span> <span class="n">as</span> <span
class="nv">$key</span> <span class="o">=></span> <span
class="nv">$item</span><span class="p">)</span> <span class="p">{</span>
+ <span class="k">if</span><span class="p">(</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'type'</span><span class="p">]</span> <span
class="o">==</span> <span class="s">'ldap'</span><span
class="p">)</span> <span class="p">{</span>
+ <span class="nv">$affilValFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="s">'validateLDAPUser'</span><span
class="p">;</span>
+ <span class="nv">$affilValFuncArgs</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+ <span class="nv">$addUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="s">'addLDAPUser'</span><span
class="p">;</span>
+ <span class="nv">$addUserFuncArgs</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+ <span class="nv">$updateUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="s">'updateLDAPUser'</span><span
class="p">;</span>
+ <span class="nv">$updateUserFuncArgs</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="nv">$key</span><span class="p">;</span>
+ <span class="p">}</span>
+ <span class="n">elseif</span><span class="p">(</span><span
class="nv">$item</span><span class="p">[</span><span
class="s">'type'</span><span class="p">]</span> <span
class="o">==</span> <span class="s">'local'</span><span
class="p">)</span> <span class="p">{</span>
+ <span class="nv">$affilValFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return 0;'</span><span class="p">);</span>
+ <span class="nv">$addUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return NULL;'</span><span class="p">);</span>
+ <span class="nv">$updateUserFunc</span><span
class="p">[</span><span class="nv">$item</span><span class="p">[</span><span
class="s">'affiliationid'</span><span class="p">]]</span> <span
class="o">=</span> <span class="n">create_function</span><span
class="p">(</span><span class="s">''</span><span class="p">,</span>
<span class="s">'return NULL;'</span><span class="p">);</span>
+ <span class="p">}</span>
+ <span class="p">}</span>
</pre></div>
