Author: buildbot
Date: Wed Jan 28 21:46:52 2015
New Revision: 938110
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/docs/VCL24InstallGuide.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jan 28 21:46:52 2015
@@ -1 +1 @@
-1655476
+1655477
Modified: websites/staging/vcl/trunk/content/docs/VCL24InstallGuide.html
==============================================================================
--- websites/staging/vcl/trunk/content/docs/VCL24InstallGuide.html (original)
+++ websites/staging/vcl/trunk/content/docs/VCL24InstallGuide.html Wed Jan 28
21:46:52 2015
@@ -83,28 +83,28 @@ three parts of VCL. Alternatively, the
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.
<pre><code>
-vcl-install.sh [-h|--help] [-d|--database] [-w|--web] [-m|--managementnode]
- [--dbhost <hostname> --dbpass <password>]
- [--mnhost <hostname>] [--webhost <hostname>]</p>
-<div class="codehilite"><pre> <span class="o">-</span><span
class="n">d</span><span class="o">|--</span><span class="n">database</span>
<span class="o">-</span> <span class="n">install</span> <span
class="n">database</span> <span class="n">server</span> <span
class="n">components</span>
- <span class="o">--</span><span class="n">dbpass</span><span
class="p">,</span> <span class="o">--</span><span class="n">mnhost</span><span
class="p">,</span> <span class="o">--</span><span class="n">mnip</span><span
class="p">,</span> <span class="o">--</span><span class="n">webhost</span><span
class="p">,</span> <span class="n">and</span> <span class="o">--</span><span
class="n">adminpass</span> <span class="n">must</span> <span
class="n">also</span> <span class="n">be</span> <span class="n">specified</span>
+ vcl-install.sh [-h|--help] [-d|--database] [-w|--web] [-m|--managementnode]
+ [--dbhost <hostname> --dbpass <password>]
+ [--mnhost <hostname>] [--webhost <hostname>]</p>
+<div class="codehilite"><pre><span class="o">-</span><span
class="n">d</span><span class="o">|--</span><span class="n">database</span>
<span class="o">-</span> <span class="n">install</span> <span
class="n">database</span> <span class="n">server</span> <span
class="n">components</span>
+ <span class="o">--</span><span class="n">dbpass</span><span
class="p">,</span> <span class="o">--</span><span class="n">mnhost</span><span
class="p">,</span> <span class="o">--</span><span class="n">mnip</span><span
class="p">,</span> <span class="o">--</span><span class="n">webhost</span><span
class="p">,</span> <span class="n">and</span> <span class="o">--</span><span
class="n">adminpass</span> <span class="n">must</span> <span
class="n">also</span> <span class="n">be</span> <span class="n">specified</span>
- <span class="o">-</span><span class="n">w</span><span
class="o">|--</span><span class="n">web</span> <span class="o">-</span> <span
class="n">install</span> <span class="n">web</span> <span
class="n">server</span> <span class="n">components</span>
- <span class="o">--</span><span class="n">dbhost</span> <span
class="n">and</span> <span class="o">--</span><span class="n">dbpass</span>
<span class="n">must</span> <span class="n">also</span> <span
class="n">be</span> <span class="n">specified</span>
+<span class="o">-</span><span class="n">w</span><span
class="o">|--</span><span class="n">web</span> <span class="o">-</span> <span
class="n">install</span> <span class="n">web</span> <span
class="n">server</span> <span class="n">components</span>
+ <span class="o">--</span><span class="n">dbhost</span> <span
class="n">and</span> <span class="o">--</span><span class="n">dbpass</span>
<span class="n">must</span> <span class="n">also</span> <span
class="n">be</span> <span class="n">specified</span>
- <span class="o">-</span><span class="n">m</span><span
class="o">|--</span><span class="n">managementnode</span> <span
class="o">-</span> <span class="n">install</span> <span
class="n">management</span> <span class="n">node</span> <span
class="p">(</span><span class="n">vcld</span><span class="p">)</span> <span
class="n">components</span>
- <span class="o">--</span><span class="n">dbhost</span><span
class="p">,</span> <span class="o">--</span><span class="n">dbpass</span><span
class="p">,</span> <span class="n">and</span> <span class="o">--</span><span
class="n">adminpass</span> <span class="n">must</span> <span
class="n">also</span> <span class="n">be</span> <span class="n">specified</span>
+<span class="o">-</span><span class="n">m</span><span
class="o">|--</span><span class="n">managementnode</span> <span
class="o">-</span> <span class="n">install</span> <span
class="n">management</span> <span class="n">node</span> <span
class="p">(</span><span class="n">vcld</span><span class="p">)</span> <span
class="n">components</span>
+ <span class="o">--</span><span class="n">dbhost</span><span
class="p">,</span> <span class="o">--</span><span class="n">dbpass</span><span
class="p">,</span> <span class="n">and</span> <span class="o">--</span><span
class="n">adminpass</span> <span class="n">must</span> <span
class="n">also</span> <span class="n">be</span> <span class="n">specified</span>
- <span class="o">--</span><span class="n">dbhost</span> <span
class="o"><</span><span class="n">hostname</span><span class="o">></span>
<span class="o">-</span> <span class="n">hostname</span> <span
class="n">of</span> <span class="n">database</span> <span
class="n">server</span> <span class="p">(</span><span
class="n">default</span><span class="p">=</span><span
class="n">localhost</span><span class="p">)</span>
+<span class="o">--</span><span class="n">dbhost</span> <span
class="o"><</span><span class="n">hostname</span><span class="o">></span>
<span class="o">-</span> <span class="n">hostname</span> <span
class="n">of</span> <span class="n">database</span> <span
class="n">server</span> <span class="p">(</span><span
class="n">default</span><span class="p">=</span><span
class="n">localhost</span><span class="p">)</span>
- <span class="o">--</span><span class="n">dbpass</span> <span
class="o"><</span><span class="n">password</span><span class="o">></span>
<span class="o">-</span> <span class="n">password</span> <span
class="n">VCL</span> <span class="n">will</span> <span class="n">use</span>
<span class="k">for</span> <span class="n">accessing</span>
- <span class="n">database</span> <span class="p">(</span><span
class="n">default</span><span class="p">=</span><span
class="n">random</span><span class="p">)</span>
+<span class="o">--</span><span class="n">dbpass</span> <span
class="o"><</span><span class="n">password</span><span class="o">></span>
<span class="o">-</span> <span class="n">password</span> <span
class="n">VCL</span> <span class="n">will</span> <span class="n">use</span>
<span class="k">for</span> <span class="n">accessing</span>
+ <span class="n">database</span> <span class="p">(</span><span
class="n">default</span><span class="p">=</span><span
class="n">random</span><span class="p">)</span>
- <span class="o">--</span><span class="n">mnhost</span> <span
class="o"><</span><span class="n">hostname</span><span class="o">></span>
<span class="o">-</span> <span class="n">hostname</span> <span
class="n">of</span> <span class="n">management</span> <span
class="n">node</span> <span class="p">(</span><span
class="n">default</span><span class="p">=</span><span
class="n">localhost</span><span class="p">)</span>
+<span class="o">--</span><span class="n">mnhost</span> <span
class="o"><</span><span class="n">hostname</span><span class="o">></span>
<span class="o">-</span> <span class="n">hostname</span> <span
class="n">of</span> <span class="n">management</span> <span
class="n">node</span> <span class="p">(</span><span
class="n">default</span><span class="p">=</span><span
class="n">localhost</span><span class="p">)</span>
- <span class="o">--</span><span class="n">webhost</span> <span
class="o"><</span><span class="n">hostname</span><span class="o">></span>
<span class="o">-</span> <span class="n">hostname</span> <span
class="n">of</span> <span class="n">web</span> <span class="n">server</span>
<span class="p">(</span><span class="n">default</span><span
class="p">=</span><span class="n">localhost</span><span class="p">)</span>
+<span class="o">--</span><span class="n">webhost</span> <span
class="o"><</span><span class="n">hostname</span><span class="o">></span>
<span class="o">-</span> <span class="n">hostname</span> <span
class="n">of</span> <span class="n">web</span> <span class="n">server</span>
<span class="p">(</span><span class="n">default</span><span
class="p">=</span><span class="n">localhost</span><span class="p">)</span>
- <span class="o">--</span><span class="n">adminpass</span> <span
class="o"><</span><span class="n">password</span><span class="o">></span>
<span class="o">-</span> <span class="n">password</span> <span
class="k">for</span> <span class="n">VCL</span> <span class="n">admin</span>
<span class="n">user</span>
+<span class="o">--</span><span class="n">adminpass</span> <span
class="o"><</span><span class="n">password</span><span class="o">></span>
<span class="o">-</span> <span class="n">password</span> <span
class="k">for</span> <span class="n">VCL</span> <span class="n">admin</span>
<span class="n">user</span>
</pre></div>
@@ -140,26 +140,22 @@ page to download and verify apache-VCL-2
<li>
<p>Install MySQL Server</p>
<div class="codehilite"><pre><span class="n">yum</span> <span
class="n">install</span> <span class="n">mysql</span><span
class="o">-</span><span class="n">server</span> <span class="o">-</span><span
class="n">y</span>
-</pre></div>
-
+<span class="n">or</span> <span class="n">install</span> <span
class="n">MariaDB</span> <span class="n">Server</span>
-</li>
-</ul>
-<p>or install MariaDB Server</p>
-<div class="codehilite"><pre> <span class="p">:::</span><span
class="n">BashLexer</span>
- <span class="n">yum</span> <span class="n">install</span> <span
class="n">mariadb</span><span class="o">-</span><span class="n">server</span>
<span class="o">-</span><span class="n">y</span>
+<span class="p">:::</span><span class="n">BashLexer</span>
+<span class="n">yum</span> <span class="n">install</span> <span
class="n">mariadb</span><span class="o">-</span><span class="n">server</span>
<span class="o">-</span><span class="n">y</span>
</pre></div>
-<ul>
+</li>
<li>
<p>Configure the database daemon to start automatically:</p>
<div class="codehilite"><pre><span class="o">/</span><span
class="n">sbin</span><span class="o">/</span><span class="n">chkconfig</span>
<span class="o">--</span><span class="n">level</span> 345 <span
class="n">mysqld</span> <span class="n">on</span>
+</pre></div>
-<span class="n">or</span>
-<span class="p">:::</span><span class="n">BashLexer</span>
-<span class="o">/</span><span class="n">sbin</span><span
class="o">/</span><span class="n">chkconfig</span> <span
class="o">--</span><span class="n">level</span> 345 <span
class="n">mariadb</span> <span class="n">on</span>
+<p>or</p>
+<div class="codehilite"><pre><span class="o">/</span><span
class="n">sbin</span><span class="o">/</span><span class="n">chkconfig</span>
<span class="o">--</span><span class="n">level</span> 345 <span
class="n">mariadb</span> <span class="n">on</span>
</pre></div>
@@ -167,11 +163,11 @@ page to download and verify apache-VCL-2
<li>
<p>Start the database daemon:</p>
<div class="codehilite"><pre><span class="o">/</span><span
class="n">sbin</span><span class="o">/</span><span class="n">service</span>
<span class="n">mysqld</span> <span class="n">start</span>
+</pre></div>
-<span class="n">or</span>
-<span class="p">:::</span><span class="n">BashLexer</span>
-<span class="o">/</span><span class="n">sbin</span><span
class="o">/</span><span class="n">service</span> <span class="n">mariadb</span>
<span class="n">start</span>
+<p>or</p>
+<div class="codehilite"><pre><span class="o">/</span><span
class="n">sbin</span><span class="o">/</span><span class="n">service</span>
<span class="n">mariadb</span> <span class="n">start</span>
</pre></div>
