Author: buildbot
Date: Thu Jan 29 20:10:04 2015
New Revision: 938276
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.3.2to2.4.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jan 29 20:10:04 2015
@@ -1 +1 @@
-1655839
+1655841
Modified:
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.3.2to2.4.html
==============================================================================
---
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.3.2to2.4.html
(original)
+++
websites/staging/vcl/trunk/content/docs/UpgradePreviousVersions/UpgradeFrom2.3.2to2.4.html
Thu Jan 29 20:10:04 2015
@@ -166,6 +166,38 @@ VCL web code at /var/www/html/vcl. If yo
</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>
+<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>
+
+# <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>
+</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>
<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>
