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 2017/07/17 19:43:30 UTC
svn commit: r1015601 - in /websites/staging/vcl/trunk/content: ./
docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.html
Author: buildbot
Date: Mon Jul 17 19:43:30 2017
New Revision: 1015601
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:43:30 2017
@@ -1 +1 @@
-1802187
+1802200
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:43:30 2017
@@ -21,7 +21,7 @@
<link href="/css/vcl.css" rel="stylesheet" type="text/css">
<link href="/css/code.css" rel="stylesheet" type="text/css">
- <title>Apache VCL - Upgrade From 2.3.2 to 2.4.2</title>
+ <title>Apache VCL - Upgrade From 2.4.2 to 2.5</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
@@ -82,7 +82,7 @@ h2:hover > .headerlink, h3:hover > .head
</div>
<div id="content">
- <h1 class="title">Upgrade From 2.3.2 to 2.4.2</h1>
+ <h1 class="title">Upgrade From 2.4.2 to 2.5</h1>
<style type="text/css">
/* The following code is added by mdx_elementid.py
It was originally lifted from http://subversion.apache.org/style/site.css */
@@ -95,17 +95,17 @@ h2:hover > .headerlink, h3:hover > .head
}
h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
<h1 id="scripted-upgrade">Scripted Upgrade<a class="headerlink" href="#scripted-upgrade" title="Permanent link">¶</a></h1>
-<p>VCL 2.4.2 is the first release to include an upgrade script. All you need to
+<p>VCL 2.5 is the second release to include an upgrade script. All you need to
upgrade VCL is the script. It will download and validate the VCL software and
then upgrade your system. The script can be used to upgrade all three parts of
VCL (database, web portal, and management node) or to upgrade each part
individually. It works for upgrading from any previous version of Apache VCL.</p>
-<p><a href="https://www.apache.org/dist/vcl/2.4.2/vcl-upgrade.sh">Download Upgrade Script (vcl-upgrade.sh)</a></p>
-<div class="codehilite"><pre><span class="n">wget</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</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">vcl</span><span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sh</span><span class="p">.</span><span class="n">sha1</span>
+<p><a href="https://www.apache.org/dist/vcl/2.5/vcl-upgrade.sh">Download Upgrade Script (vcl-upgrade.sh)</a></p>
+<div class="codehilite"><pre><span class="n">wget</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</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">vcl</span><span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sh</span><span class="p">.</span><span class="n">sha1</span>
<span class="n">sha1sum</span> <span class="o">-</span><span class="n">c</span> <span class="n">vcl</span><span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sh</span><span class="p">.</span><span class="n">sha1</span>
<span class="n">wget</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="n">KEYS</span>
<span class="n">gpg</span> <span class="o">--</span><span class="n">import</span> <span class="n">KEYS</span>
-<span class="n">wget</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</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">vcl</span><span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sh</span><span class="p">.</span><span class="n">asc</span>
+<span class="n">wget</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</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">vcl</span><span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sh</span><span class="p">.</span><span class="n">asc</span>
<span class="n">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">vcl</span><span class="o">-</span><span class="n">upgrade</span><span class="p">.</span><span class="n">sh</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
@@ -139,27 +139,27 @@ for the code to run.</p>
<hr />
<h1 id="manual-upgrade-instructions">Manual Upgrade Instructions<a class="headerlink" href="#manual-upgrade-instructions" title="Permanent link">¶</a></h1>
-<p>These instructions explain how to upgrade from VCL 2.3.2 to VCL 2.4.2. Please note
-it only applies for the upgrade from 2.3.2 to 2.4.2, this may or may not work for other
+<p>These instructions explain how to upgrade from VCL 2.4.2 to VCL 2.5. Please note
+it only applies for the upgrade from 2.4.2 to 2.5, this may or may not work for other
versions.</p>
<p><strong>The basic steps that will be performed</strong></p>
<ul>
-<li>Download and Extract 2.4.2 code </li>
+<li>Download and Extract 2.5 code </li>
<li>Shutdown httpd and vcld services</li>
<li>Create backup of vcl database </li>
<li>Update mysql schema</li>
<li>Update web code, create a backup, copy in new, make changes </li>
<li>Restart httpd service</li>
-<li>Update management node vcl code, create a backup, copy in new, make changes </li>
+<li>Update management node VCL code, create a backup, copy in new, make changes </li>
<li>Restart vcld service</li>
</ul>
<h3 id="upgrade-steps">Upgrade steps<a class="headerlink" href="#upgrade-steps" title="Permanent link">¶</a></h3>
<ol>
<li>follow instructions on the <a href="http://vcl.apache.org/downloads/download.cgi">VCL download</a>
-page to download and verify apache-VCL-2.4.2.tar.bz2 and put in in /root</li>
+page to download and verify apache-VCL-2.5.tar.bz2 and put in in /root</li>
<li>
-<p><strong>extract VCL 2.4.2 code</strong></p>
-<div class="codehilite"><pre><span class="n">tar</span> <span class="n">xf</span> <span class="n">apache</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="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">bz2</span>
+<p><strong>extract VCL 2.5 code</strong></p>
+<div class="codehilite"><pre><span class="n">tar</span> <span class="n">xf</span> <span class="n">apache</span><span class="o">-</span><span class="n">VCL</span><span class="o">-</span>2<span class="p">.</span>5<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">bz2</span>
</pre></div>
@@ -175,94 +175,90 @@ page to download and verify apache-VCL-2
<li>
<p>create a <strong>backup</strong> of the VCL database. 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="p">.</span>4<span class="p">.</span>2<span class="o">-</span><span class="n">upgrade</span><span class="p">.</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>5<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 database</strong> schema.</p>
-<div class="codehilite"><pre><span class="n">mysql</span> <span class="n">vcl</span> <span class="o"><</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>4<span class="p">.</span>2<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>
+<div class="codehilite"><pre><span class="n">mysql</span> <span class="n">vcl</span> <span class="o"><</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>5<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><strong>Update the web code</strong>. This step we will move the 2.3.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
+<p><strong>Move old web code</strong>. If /var/www/html/vcl is a directory, 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>
-<div class="codehilite"><pre><span class="n">mv</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="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>2<span class="p">.</span>3<span class="p">.</span>2
+<div class="codehilite"><pre><span class="n">mv</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="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>2<span class="p">.</span>4<span class="p">.</span>2
</pre></div>
</li>
<li>
<p><strong>Disable access</strong> to the old web code</p>
-<div class="codehilite"><pre><span class="n">echo</span> "<span class="n">Deny</span> <span class="n">from</span> <span class="n">all</span>" <span class="o">></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>2<span class="p">.</span>3<span class="p">.</span>2<span class="o">/</span><span class="p">.</span><span class="n">htaccess</span>
+<div class="codehilite"><pre><span class="n">echo</span> "<span class="n">Require</span> <span class="n">all</span> <span class="n">denied</span>" <span class="o">></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>2<span class="p">.</span>4<span class="p">.</span>2<span class="o">/</span><span class="p">.</span><span class="n">htaccess</span>
</pre></div>
</li>
<li>
<p><strong>Copy the new code</strong> in place</p>
-<div class="codehilite"><pre><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>4<span class="p">.</span>2<span class="o">/</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><span class="o">-</span>2<span class="p">.</span>4<span class="p">.</span>2
-<span class="n">ln</span> <span class="o">-</span><span class="n">s</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>2<span class="p">.</span>4<span class="p">.</span>2 <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>
+<div class="codehilite"><pre><span class="n">cp</span> <span class="o">-</span><span class="n">ar</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>5<span class="o">/</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><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">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>2<span class="p">.</span>5 <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.3.2 config files</strong></p>
-<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="o">/</span><span class="n">vcl</span><span class="o">-</span>2<span class="p">.</span>3<span class="p">.</span>2<span class="o">/</span><span class="p">.</span><span class="n">ht</span><span class="o">-</span><span class="n">inc</span>
+<p><strong>Copy your 2.4.2 config files</strong></p>
+<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="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="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>Add new items to conf.php</strong>. The following items need to be added to the conf.php
-file (they can be added anywhere as long as it is not inside an
-array() definition):</p>
+<p><strong>Set SELinux context</strong> If you are using SELinux, set the correct context:</p>
+<div class="codehilite"><pre><span class="n">chcon</span> <span class="o">-</span><span class="n">R</span> <span class="o">-</span><span class="n">t</span> <span class="n">httpd_sys_content_t</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>2<span class="p">.</span>5
+<span class="n">chcon</span> <span class="o">-</span><span class="n">t</span> <span class="n">httpd_sys_rw_content_t</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>2<span class="p">.</span>5<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>
+<span class="n">chcon</span> <span class="o">-</span><span class="n">t</span> <span class="n">httpd_sys_rw_content_t</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>2<span class="p">.</span>5<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">cryptkey</span>
+</pre></div>
+
+
+</li>
+<li>
+<p><strong>Add new items to 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>
</pre></div>
<p><br></p>
-<div class="codehilite"><pre><span class="n">define</span><span class="p">(</span>"<span class="n">SEMTIMEOUT</span>"<span class="p">,</span> "45"<span class="p">);</span>
-
-<span class="n">define</span><span class="p">(</span>"<span class="n">MAXINITIALIMAGINGTIME</span>"<span class="p">,</span> 720<span class="p">);</span> <span class="o">//</span> <span class="k">for</span> <span class="n">imaging</span> <span class="n">reservations</span><span class="p">,</span> <span class="n">users</span> <span class="n">will</span> <span class="n">have</span> <span class="n">at</span> <span class="n">least</span> <span class="n">this</span> <span class="n">long</span> <span class="n">as</span> <span class="n">the</span> <span class="n">max</span> <span class="n">selectable</span> <span class="n">duration</span>
-
-<span class="n">define</span><span class="p">(</span>"<span class="n">MAXSUBIMAGES</span>"<span class="p">,</span> 5000<span class="p">);</span> <span class="o">//</span> <span class="n">maximum</span> <span class="n">allowed</span> <span class="n">number</span> <span class="k">for</span> <span class="n">subimages</span> <span class="n">in</span> <span class="n">a</span> <span class="n">config</span>
-
-# <span class="n">boolean</span> <span class="n">value</span> <span class="n">of</span> 0 <span class="n">or</span> 1 <span class="n">to</span> <span class="n">enable</span> <span class="n">documentation</span> <span class="n">links</span> <span class="n">on</span> <span class="n">login</span> <span class="n">page</span> <span class="n">and</span> <span class="n">page</span>
-# <span class="n">where</span> <span class="n">authentication</span> <span class="n">method</span> <span class="n">is</span> <span class="n">selected</span>
-# 0 <span class="p">=</span> <span class="n">disables</span><span class="p">;</span> 1 <span class="p">=</span> <span class="n">enabled</span>
-<span class="n">define</span><span class="p">(</span>"<span class="n">NOAUTH_HOMENAV</span>"<span class="p">,</span> 0<span class="p">);</span>
-
-# <span class="n">boolean</span> <span class="n">value</span> <span class="n">of</span> 0 <span class="n">or</span> 1 <span class="n">to</span> <span class="n">control</span> <span class="n">logging</span> <span class="n">of</span> <span class="n">non</span> <span class="n">SELECT</span> <span class="n">database</span> <span class="n">queries</span> <span class="k">for</span> <span class="n">auditing</span> <span class="n">or</span> <span class="n">debugging</span> <span class="n">purposes</span><span class="p">;</span> <span class="n">queries</span> <span class="n">are</span> <span class="n">logged</span> <span class="n">to</span> <span class="n">the</span> <span class="n">querylog</span> <span class="n">table</span>
-<span class="n">define</span><span class="p">(</span>"<span class="n">QUERYLOGGING</span>"<span class="p">,</span> 1<span class="p">);</span>
+<div class="codehilite"><pre><span class="n">define</span><span class="p">(</span>"<span class="n">MAXVMLIMIT</span>"<span class="p">,</span> "100"<span class="p">);</span>
+</pre></div>
-# <span class="n">boolean</span> <span class="n">value</span> <span class="n">of</span> 0 <span class="n">or</span> 1 <span class="n">to</span> <span class="n">control</span> <span class="n">logging</span> <span class="n">of</span> <span class="n">XMLRPC</span> <span class="n">calls</span> <span class="k">for</span> <span class="n">auditing</span> <span class="n">or</span> <span class="n">debugging</span> <span class="n">purposes</span><span class="p">;</span> <span class="n">queries</span> <span class="n">are</span> <span class="n">logged</span> <span class="n">to</span> <span class="n">the</span> <span class="n">xmlrpcLog</span> <span class="n">table</span>
-<span class="n">define</span><span class="p">(</span>"<span class="n">XMLRPCLOGGING</span>"<span class="p">,</span> 1<span class="p">);</span>
-# <span class="n">documentation</span> <span class="n">links</span> <span class="n">to</span> <span class="n">display</span> <span class="n">on</span> <span class="n">login</span> <span class="n">page</span> <span class="n">and</span> <span class="n">page</span>
-# <span class="n">where</span> <span class="n">authentication</span> <span class="n">method</span> <span class="n">is</span> <span class="n">selected</span> <span class="n">when</span> <span class="n">NOAUTH_HOMENAV</span> <span class="n">is</span> <span class="n">set</span> <span class="n">to</span> 1
-$<span class="n">NOAUTH_HOMENAV</span> <span class="p">=</span> <span class="n">array</span> <span class="p">(</span>
- "<span class="n">What</span> <span class="n">is</span> <span class="n">VCL</span>" <span class="p">=</span><span class="o">></span> "<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">vcl</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span>"<span class="p">,</span>
- "<span class="n">How</span> <span class="n">to</span> <span class="n">use</span> <span class="n">VCL</span>" <span class="p">=</span><span class="o">></span> "<span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">cwiki</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">confluence</span><span class="o">/</span><span class="n">display</span><span class="o">/</span><span class="n">VCL</span><span class="o">/</span><span class="n">Using</span><span class="o">+</span><span class="n">VCL</span>"<span class="p">,</span>
- "<span class="n">Report</span> <span class="n">a</span> <span class="n">Problem</span>" <span class="p">=</span><span class="o">></span> "<span class="n">mailto</span><span class="p">:</span>" <span class="p">.</span> <span class="n">HELPEMAIL</span><span class="p">,</span>
-<span class="p">);</span>
+</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"><</span><span class="n">br</span><span class="o">></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">'xxxxxxxxxxxxxxxxxxxxxxxxx'</span><span class="p">;</span>
</pre></div>
</li>
<li>
-<p><strong>Make the maintenance directory writable</strong> by the web server user. Normally this is
-the apache user, if using a different user change below cmd accordingly.</p>
+<p><strong>Make the maintenance and cryptkey directories writable</strong> by the web server user. Normally this is
+the apache user, if using a different user change below command accordingly.</p>
<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>
+<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">cryptkey</span>
</pre></div>
@@ -275,23 +271,44 @@ the apache user, if using a different us
</li>
<li>
-<p><strong>Backup management node code</strong>. This step will make a backup copy of the 2.3.2<br />
+<p><strong>Check testsetup.php</strong> Check that everything is correct by viewing the testsetup.php
+script in your browser. This script is located in the same directory as the index.php script.
+I.e.</p>
+<div class="codehilite"><pre><span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">your</span><span class="p">.</span><span class="n">site</span><span class="p">.</span><span class="n">url</span><span class="o">/</span><span class="n">vcl</span><span class="o">/</span><span class="n">testsetup</span><span class="p">.</span><span class="n">php</span>
+</pre></div>
+
+
+</li>
+<li>
+<p><strong>Backup management node code</strong>. This step will make a backup copy of the 2.4.2<br />
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>
-<div class="codehilite"><pre><span class="n">cp</span> <span class="o">-</span><span class="n">r</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>3<span class="p">.</span>2
+<div class="codehilite"><pre><span class="n">cp</span> <span class="o">-</span><span class="n">r</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
+</pre></div>
+
+
+</li>
+<li>
+<p><strong>Copy old management node code</strong> If /usr/local/vcl is a directory, copy it to
+/usr/local/vcl-2.4.2, rename /usr/local/vcl to /usr/local/vcl-2.5, and create a symlink.
+If /usr/local/vcl is a symlink to vcl-2.4.2, copy /usr/local/vcl-2.4.2 to /usr/local/vcl-2.5
+and update the symlink.</p>
+<div class="codehilite"><pre><span class="p">(</span><span class="k">for</span> <span class="n">directory</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><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"><</span><span class="n">br</span><span class="o">></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>
</li>
<li>
-<p><strong>Copy in the 2.4.2 management node code</strong> to /usr/local. First, rename the existing
-management node code directory to vcl-2.4.2 so that any drivers or other files you've
-added are preserved. Then, create a symlink for /usr/local/vcl and copy the new
-management code over top of it.</p>
-<div class="codehilite"><pre><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>4<span class="p">.</span>2
-<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>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><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>4<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>
+<p><strong>Copy new code in place</strong> Copy the new management node code over the old code:</p>
+<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>5<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><span class="o">-</span>2<span class="p">.</span>5
</pre></div>