Author: buildbot
Date: Mon Jul 17 19:57:54 2017
New Revision: 1015604
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:57:54 2017
@@ -1 +1 @@
-1802202
+1802203
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:57:54 2017
@@ -188,7 +188,7 @@ necessary.</p>
</li>
<li>
-<p><strong>Move old web code</strong>. If /var/www/html/vcl is a directory,
rename it to
+<p><strong>Possibly move old web code</strong>. If /var/www/html/vcl
<strong>is a directory</strong>, rename it to
/var/www/html/vcl-2.4.2. 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>
@@ -230,7 +230,7 @@ VCL web code at /var/www/html/vcl. If yo
</li>
<li>
-<p><strong>Add new items to conf.php</strong>. The following item needs to be
removed from the conf.php
+<p><strong>Update conf.php</strong>. The following item needs to be removed
from the conf.php
file:</p>
<div class="codehilite"><pre><span class="p">(</span><span
class="n">don</span><span class="o">'</span><span class="n">t</span> <span
class="n">forget</span> <span class="n">to</span> <span class="n">edit</span>
<span class="n">conf</span><span class="p">.</span><span class="n">php</span>
<span class="n">in</span> <span class="n">the</span> <span
class="o">**</span><span class="n">new</span><span class="o">**</span> <span
class="n">location</span><span class="p">)</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">conf</span><span class="p">.</span><span
class="n">php</span>
@@ -244,7 +244,7 @@ file:</p>
</li>
<li>
-<p><strong>Set new value for $cryptkey in secrets.php</strong> $cryptkey in
secrets.php needs to be generated
+<p><strong>Update 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="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>
@@ -252,7 +252,7 @@ using openssl. Generate the value and se
<p><br></p>
-<div class="codehilite"><pre>$<span class="n">cryptkey</span> <span
class="p">=</span> <span
class="s">'xxxxxxxxxxxxxxxxxxxxxxxxx'</span><span class="p">;</span>
+<div class="codehilite"><pre>$<span class="n">cryptkey</span> <span
class="p">=</span> <span
class="s">'xxxxxxxxxxxxxxxxxxxxxxxxx'</span><span class="p">;</span> #
<span class="n">set</span> <span class="n">this</span> <span
class="n">to</span> <span class="n">output</span> <span class="n">of</span>
"<span class="n">openssl</span> <span class="nb">rand</span> 32 <span
class="o">|</span> <span class="n">base64</span>"
</pre></div>
@@ -283,7 +283,7 @@ I.e.</p>
</li>
<li>
-<p><strong>Backup management node code</strong>. This step will make a backup
copy of the 2.4.2<br />
+<p><strong>Backup management node code</strong>. This step will make a backup
copy of the 2.4.2
management node code. These instructions assume that you installed the
VCL management node code at /usr/local/vcl. If you installed it elsewhere,
replace
/usr/local with your management node path.</p>
