Author: buildbot Date: Mon Jun 10 15:55:22 2019 New Revision: 1046081 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.1.html Propchange: websites/staging/vcl/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Mon Jun 10 15:55:22 2019 @@ -1 +1 @@ -1860955 +1860957 Modified: websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.1.html ============================================================================== --- websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.1.html (original) +++ websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.4.2to2.5.1.html Mon Jun 10 15:55:22 2019 @@ -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.4.2 to 2.5</title> + <title>Apache VCL - Upgrade From 2.4.2 to 2.5.1</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> @@ -94,7 +94,7 @@ h2:hover > .headerlink, h3:hover > .head </div> <div id="content"> - <h1 class="title">Upgrade From 2.4.2 to 2.5</h1> + <h1 class="title">Upgrade From 2.4.2 to 2.5.1</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 */ @@ -107,17 +107,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.5 is the second release to include an upgrade script. All you need to +<p>VCL 2.5.1 includes 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.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> +<p><a href="https://www.apache.org/dist/vcl/2.5.1/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="p">.</span>1<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">sha512</span> +<span class="n">sha512sum</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">sha512</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>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">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="p">.</span>1<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> @@ -151,12 +151,12 @@ 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.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 +<p>These instructions explain how to upgrade from VCL 2.4.2 to VCL 2.5.1. Please note +it only applies for the upgrade from 2.4.2 to 2.5.1, 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.5 code </li> +<li>Download and Extract 2.5.1 code </li> <li>Shutdown httpd and vcld services</li> <li>Create backup of vcl database </li> <li>Update mysql schema</li> @@ -168,10 +168,10 @@ versions.</p> <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.5.tar.bz2 and put in in /root</li> +page to download and verify apache-VCL-2.5.1.tar.bz2 and put in in /root</li> <li> -<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> +<p><strong>extract VCL 2.5.1 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>1<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">bz2</span> </pre></div> @@ -187,14 +187,14 @@ 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>5<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="p">.</span>1<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>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> +<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="p">.</span>1<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> @@ -218,8 +218,8 @@ VCL web code at /var/www/html/vcl. If yo </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">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> +<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="p">.</span>1<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="p">.</span>1 +<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="p">.</span>1 <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> @@ -234,27 +234,35 @@ VCL web code at /var/www/html/vcl. If yo </li> <li> <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> +<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="p">.</span>1 +<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="p">.</span>1<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="p">.</span>1<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>Update conf.php</strong>. The following item needs to be removed from the conf.php -file:</p> +<p><strong>Update conf.php</strong>. The following item needs to be added to the conf.php +file. (It is located above the define line for BASEURL in the conf-default.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">MAXVMLIMIT</span>"<span class="p">,</span> "100"<span class="p">);</span> +<div class="codehilite"><pre><span class="n">define</span><span class="p">(</span>"<span class="n">SSLOFFLOAD</span>"<span class="p">,</span> 0<span class="p">);</span> </pre></div> </li> +</ol> +<p><br>The following item needs to be removed from the conf.php file:</p> +<div class="codehilite"><pre> <span class="p">:::</span><span class="n">PhpLexer</span> + <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> + + +<ol> <li> <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> @@ -296,27 +304,27 @@ I.e.</p> </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 +/usr/local/vcl-2.4.2, rename /usr/local/vcl to /usr/local/vcl-2.5.1, 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.1 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="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="p">.</span>1 +<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="p">.</span>1 <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></p> <div class="codehilite"><pre><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> +<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="p">.</span>1 +<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="p">.</span>1 <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 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">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">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 +<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">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="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><span class="o">-</span>2<span class="p">.</span>5<span class="p">.</span>1 </pre></div>