Updated site from master (bfbfe8a62a53ae5c03624da53ce24f65aa8a0e4b)
diff --git a/content/docs/VCL251InstallGuide.html b/content/docs/VCL251InstallGuide.html
index bf9117e..d416459 100644
--- a/content/docs/VCL251InstallGuide.html
+++ b/content/docs/VCL251InstallGuide.html
@@ -91,7 +91,13 @@
gpg --import KEYS
wget https://www.apache.org/dist/vcl/2.5.1/vcl-install.sh.asc
gpg --verify vcl-install.sh.asc
-</code></pre></div><p>Running the installation script with no arguments will step you through installing all
+</code></pre></div><span class="docnote">
+<b>Required Patch for Windows Images</b><br>
+Microsoft added openssh as a package that can be installed on Windows. This forced
+the Cygwin project to change the name of their ssh service from sshd to cygsshd.
+<a href="/docs/cygsshd_patch.html">A patch</a> needs to be applied to VCL 2.5.1 to accommodate this change.
+</span>
+<p>Running the installation script with no arguments will step you through installing all
three parts of VCL. Alternatively, the following explains optional arguments. If
installing the management node part of VCL, it will also prompt you to agree to the
installation of various system level requirements needed for the code to run.</p>
diff --git a/content/docs/cygsshd_patch.html b/content/docs/cygsshd_patch.html
new file mode 100644
index 0000000..632adeb
--- /dev/null
+++ b/content/docs/cygsshd_patch.html
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+
+
+ <link href="/css/vcl.css" rel="stylesheet" type="text/css">
+ <link href="/css/code.css" rel="stylesheet" type="text/css">
+ <title>Apache VCL - Cygwin SSHD Service Name Change Patch for VCL 2.5.1</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+ <div id="sitetitle">
+ <table width="100%" border="0" cellspacing="0" cellpadding="5">
+ <tr>
+ <td><a href="/index.html"><img src="/img/vcl-logo.png" height="100" align="left" alt="Apache VCL logo"></a></td>
+ <td><a href="http://www.apache.org"><img src="/img/asf-logo.png" align="right" alt="Apache Software Foundation logo"></a></td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="left-column">
+ <div id="navigation">
+ <ul>
+<li><a href="/index.html">Information</a>
+<ul>
+<li><a href="/info/features.html">Features</a></li>
+<li><a href="/info/architecture.html">Architecture</a></li>
+<li><a href="/downloads/download.cgi">Download</a></li>
+<li><a href="http://www.apache.org/licenses/">License</a></li>
+<li><a href="http://www.apache.org/security/">Security</a></li>
+</ul>
+</li>
+<li><a href="/docs/index.html">Documentation</a>
+<ul>
+<li><a href="https://cwiki.apache.org/confluence/x/yQdG">Using VCL</a></li>
+<li><a href="https://cwiki.apache.org/confluence/x/ywdG">Administration</a></li>
+<li><a href="/docs/installation.html">Installation</a></li>
+</ul>
+</li>
+<li><a href="https://cwiki.apache.org/confluence/display/VCL/Apache+VCL" target="_blank">Confluence Wiki</a>
+ <ul>
+ <li></li>
+ </ul>
+</li>
+<li><a href="https://issues.apache.org/jira/browse/VCL" target="_blank">Jira Issue Tracking</a>
+ <ul>
+ <li></li>
+ </ul>
+</li>
+<li><a href="/comm/index.html">Community</a>
+<ul>
+<li><a href="/comm/index.html#getInvolved">Getting Involved</a></li>
+<li><a href="/comm/index.html#mail-list">Mailing Lists</a></li>
+<li><a href="/dev/index.html">Development</a>
+<ul>
+<li><a href="/dev/code-documentation.html">Code Documentation</a></li>
+<li><a href="/dev/roadmap.html">Roadmap</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="http://www.apache.org">Apache Software Foundation</a>
+<ul>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+</ul>
+</li>
+</ul>
+ </div>
+ <div id="current-event">
+ <a href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-125x125.png" alt="Apache current event" />
+ </a>
+ </div>
+ </div>
+
+ <div id="content">
+ <h1 class="title">Cygwin SSHD Service Name Change Patch for VCL 2.5.1</h1>
+
+ <p>When Microsoft made openssh available as an installable package on Windows, they
+used the same service name (sshd) that cygwin had been using for many years. This
+caused the Cygwin project to change the name of the sshd service they install from
+sshd to cygsshd. VCL 2.5.1 needs a patch applied to handle the service name change.</p>
+<h1 id="download-patch">Download Patch</h1>
+<p>The patch is available from the ASF distribution servers.</p>
+<p><a href="https://dist.apache.org/repos/dist/release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch">Download patch</a>
+[ <a href="https://dist.apache.org/repos/dist/release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.asc">GPG</a> ]
+[ <a href="https://dist.apache.org/repos/dist/release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.sha512">SHA512</a> ]</p>
+<h1 id="validate-patch">Validate Patch</h1>
+<p>It is essential that you verify the integrity of the patch file using the GPG and
+SHA signatures. By verifying the integrity of the patch, you ensure it has not
+been tainted.</p>
+<p>Run the following command to verify the SHA512 sum. You should get output
+similar to “cygwin_sshd_for_2.5.1.patch: OK”:</p></p>
+<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">sha512sum -c cygwin_sshd_for_2.5.1.patch.sha512
+</code></pre></div><p>To verify the GPG signature (you’ll need to have <a href="http://www.gnupg.org/">GnuPG</a> installed):</p>
+<ol>
+<li>
+<p>download and import the <a href="https://www.apache.org/dist/vcl/KEYS">VCL KEYS file</a> (if you’ve imported the KEYS file for previously,
+you do not need to import it again):</p>
+<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">gpg --import KEYS
+</code></pre></div></li>
+<li>
+<p>download the GPG Signature to the same location as the patch file</p>
+</li>
+<li>
+<p>from the directory containing both the release file and the GPG signature, run</p>
+<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">gpg --verify cygwin_sshd_for_2.5.1.patch.asc
+
+</code></pre></div></li>
+</ol>
+<h1 id="apply-patch">Apply Patch</h1>
+<p>The patch is applied to the management node code, which is typically installed to /usr/local/vcl.
+The following example assumes the patch was downloaded to /tmp.</p>
+<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash"><span style="color:#a2f">cd</span> /usr/local/vcl
+patch -p2 < /tmp/cygwin_sshd_for_2.5.1.patch
+</code></pre></div><p>If it applies correctly, you should see a message similar to</p>
+<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">patching file bin/cygwin-sshd-config.sh
+patching file bin/gen-node-key.sh
+patching file lib/VCL/Module/OS/Windows/Version_6/8.pm
+patching file lib/VCL/Module/OS/Windows.pm
+patching file tools/Windows/Scripts/update_cygwin.cmd
+</code></pre></div>
+
+ </div>
+
+ <div id="footer">
+ <div class="copyright">
+ <p>
+ Copyright © 2020 The Apache Software Foundation, Licensed under
+ the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+ <br />
+ Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+ </p>
+ </div>
+ </div>
+
+</body>
+</html>
diff --git a/content/docs/index.xml b/content/docs/index.xml
index 278ab8e..daeed0d 100644
--- a/content/docs/index.xml
+++ b/content/docs/index.xml
@@ -325,6 +325,17 @@
</item>
<item>
+ <title>Cygwin SSHD Service Name Change Patch for VCL 2.5.1</title>
+ <link>https://vcl.apache.org/docs/cygsshd_patch.html</link>
+ <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+
+ <guid>https://vcl.apache.org/docs/cygsshd_patch.html</guid>
+ <description>When Microsoft made openssh available as an installable package on Windows, they used the same service name (sshd) that cygwin had been using for many years. This caused the Cygwin project to change the name of the sshd service they install from sshd to cygsshd. VCL 2.5.1 needs a patch applied to handle the service name change.
+Download Patch The patch is available from the ASF distribution servers.
+Download patch [ GPG ] [ SHA512 ]</description>
+ </item>
+
+ <item>
<title>Deployment Planning</title>
<link>https://vcl.apache.org/docs/deployment-planning.html</link>
<pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
diff --git a/content/downloads/download.html b/content/downloads/download.html
index 82cdfad..4290ced 100644
--- a/content/downloads/download.html
+++ b/content/downloads/download.html
@@ -133,8 +133,8 @@
<p>You may also consult the <a href="http://www.apache.org/mirrors/">complete list of mirrors</a>.</p>
<p><a name="verify"></a></p>
<h2 id="verifying-the-integrity-of-the-files">Verifying the integrity of the files</h2>
-<p>It is essential that you verify the integrity of the downloaded files using the PGP or
-MD5 signatures. Security of the mirrors cannot be guaranteed, which means malicious code
+<p>It is essential that you verify the integrity of the downloaded files using the GPG and
+SHA signatures. Security of the mirrors cannot be guaranteed, which means malicious code
could be added to the downloads from the mirrors. By verifying the integrity of
downloaded release files, you ensure they have not been tainted.</p>
<p>Run the following command to verify the SHA256 sum. You should get output
@@ -146,7 +146,7 @@
</code></pre></div><p>To verify the GPG signature (you’ll need to have <a href="http://www.gnupg.org/">GnuPG</a> installed):</p>
<ol>
<li>
-<p>download and import the <a href="https://www.apache.org/dist/vcl/KEYS">VCL KEYS file</a> (if you’ve imported the KEYS file for previously
+<p>download and import the <a href="https://www.apache.org/dist/vcl/KEYS">VCL KEYS file</a> (if you’ve imported the KEYS file for previous
releases, you do not need to import it again):</p>
<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">gpg --import KEYS
</code></pre></div></li>
diff --git a/content/index.xml b/content/index.xml
index b961a8d..25a0960 100644
--- a/content/index.xml
+++ b/content/index.xml
@@ -766,6 +766,17 @@
</item>
<item>
+ <title>Cygwin SSHD Service Name Change Patch for VCL 2.5.1</title>
+ <link>https://vcl.apache.org/docs/cygsshd_patch.html</link>
+ <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+
+ <guid>https://vcl.apache.org/docs/cygsshd_patch.html</guid>
+ <description>When Microsoft made openssh available as an installable package on Windows, they used the same service name (sshd) that cygwin had been using for many years. This caused the Cygwin project to change the name of the sshd service they install from sshd to cygsshd. VCL 2.5.1 needs a patch applied to handle the service name change.
+Download Patch The patch is available from the ASF distribution servers.
+Download patch [ GPG ] [ SHA512 ]</description>
+ </item>
+
+ <item>
<title>Database Configuration</title>
<link>https://vcl.apache.org/confluence_export/database-configuration.html</link>
<pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
diff --git a/content/sitemap.xml b/content/sitemap.xml
index 558e36f..fffe311 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -368,6 +368,11 @@
</url>
<url>
+ <loc>https://vcl.apache.org/docs/cygsshd_patch.html</loc>
+ <lastmod>2020-05-13T16:31:32-04:00</lastmod>
+ </url>
+
+ <url>
<loc>https://vcl.apache.org/confluence_export/database-configuration.html</loc>
<lastmod>2020-03-12T18:53:00+01:00</lastmod>
</url>
@@ -409,7 +414,7 @@
<url>
<loc>https://vcl.apache.org/docs.html</loc>
- <lastmod>2020-03-12T18:53:00+01:00</lastmod>
+ <lastmod>2020-05-13T16:31:32-04:00</lastmod>
</url>
<url>
@@ -419,12 +424,12 @@
<url>
<loc>https://vcl.apache.org/downloads.html</loc>
- <lastmod>2020-03-12T18:53:00+01:00</lastmod>
+ <lastmod>2020-05-13T16:31:32-04:00</lastmod>
</url>
<url>
<loc>https://vcl.apache.org/downloads/download.html</loc>
- <lastmod>2020-03-12T18:53:00+01:00</lastmod>
+ <lastmod>2020-05-13T16:31:32-04:00</lastmod>
</url>
<url>
@@ -989,7 +994,7 @@
<url>
<loc>https://vcl.apache.org/docs/VCL251InstallGuide.html</loc>
- <lastmod>2020-03-12T18:53:00+01:00</lastmod>
+ <lastmod>2020-05-13T16:31:32-04:00</lastmod>
</url>
<url>
