svn commit: r1015602 - in /websites/staging/vcl/trunk/content: ./ docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.html

[buildbot]

Author: buildbot
Date: Mon Jul 17 19:45:52 2017
New Revision: 1015602

Log:
Staging update by buildbot for vcl

Modified:
    websites/staging/vcl/trunk/content/   (props changed)
    
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.html

Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 17 19:45:52 2017
@@ -1 +1 @@
-1802200
+1802201

Modified: 
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.html
==============================================================================
--- 
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.html
 (original)
+++ 
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.html
 Mon Jul 17 19:45:52 2017
@@ -237,22 +237,21 @@ file:</p>
 </pre></div>
 
 
-<p><br></p>
-<div class="codehilite"><pre><span class="n">define</span><span 
class="p">(</span>&quot;<span class="n">MAXVMLIMIT</span>&quot;<span 
class="p">,</span> &quot;100&quot;<span class="p">);</span>
-</pre></div>
-
-
+<p><br>
+    :::PhpLexer
+    define("MAXVMLIMIT", "100");</p>
 </li>
 <li>
 <p><strong>Set new value for $cryptkey in secrets.php</strong>  $cryptkey in 
secrets.php needs to be generated
 using openssl. Generate the value and set it in secrets.php:</p>
 <div class="codehilite"><pre><span class="n">openssl</span> <span 
class="nb">rand</span> 32 <span class="o">|</span> <span class="n">base64</span>
-<span class="o">&lt;</span><span class="n">br</span><span class="o">&gt;</span>
 <span class="n">vim</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">secrets</span><span class="p">.</span><span 
class="n">php</span>
-$<span class="n">cryptkey</span> <span class="p">=</span> <span 
class="s">&#39;xxxxxxxxxxxxxxxxxxxxxxxxx&#39;</span><span class="p">;</span>
 </pre></div>
 
 
+<p><br>
+    :::PhpLexer
+    $cryptkey = 'xxxxxxxxxxxxxxxxxxxxxxxxx';</p>
 </li>
 <li>
 <p><strong>Make the maintenance and cryptkey directories writable</strong> by 
the web server user. Normally this is
@@ -298,13 +297,14 @@ and update the symlink.</p>
 <span class="n">cp</span> <span class="o">-</span><span class="n">ar</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">usr</span><span class="o">/</span><span 
class="n">local</span><span class="o">/</span><span class="n">vcl</span><span 
class="o">-</span>2<span class="p">.</span>4<span class="p">.</span>2
 <span class="n">mv</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">usr</span><span class="o">/</span><span class="n">local</span><span 
class="o">/</span><span class="n">vcl</span><span class="o">-</span>2<span 
class="p">.</span>5
 <span class="n">ln</span> <span class="o">-</span><span class="n">s</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>2<span class="p">.</span>5 <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">&lt;</span><span class="n">br</span><span class="o">&gt;</span>
-<span class="p">(</span><span class="k">for</span> <span 
class="n">symlink</span><span class="p">)</span>
-<span class="n">cp</span> <span class="o">-</span><span class="n">ar</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>2<span class="p">.</span>4<span class="p">.</span>2 <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>2<span class="p">.</span>5
-<span class="n">ln</span> <span class="o">-</span><span class="n">sfn</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>2<span class="p">.</span>5 <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>
 
 
+<p><br>
+    :::BashLexer
+    (for symlink)
+    cp -ar /usr/local/vcl-2.4.2 /usr/local/vcl-2.5
+    ln -sfn /usr/local/vcl-2.5 /usr/local/vcl</p>
 </li>
 <li>
 <p><strong>Copy new code in place</strong> Copy the new management node code 
over the old code:</p>