You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bu...@apache.org on 2015/03/25 18:59:39 UTC

svn commit: r945041 [5/5] - in /websites/staging/slider/trunk/content: ./ design/ developing/ docs/ docs/configuration/ docs/configuration/revision-1/ docs/slider_specs/

Modified: websites/staging/slider/trunk/content/docs/slider_specs/specifying_exports.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/slider_specs/specifying_exports.html (original)
+++ websites/staging/slider/trunk/content/docs/slider_specs/specifying_exports.html Wed Mar 25 17:59:38 2015
@@ -187,7 +187,7 @@ Latest release: <strong>0.60.0-incubatin
 <h2 id="exporting-configurations">Exporting configurations</h2>
 <p>Slider application packages accept an appConfig.json file for all application configuration supplied by the user. Any property whose name starts with "site" are considered configuration. <a href="application_instance_configuration.html">Specifications InstanceConfiguration</a> describes the naming convention.</p>
 <h3 id="export-specific-configs">Export specific configs</h3>
-<p>By default all configurations are exported (e.g. http://hos1:44500/ws/v1/slider/publisher/slider/storm-site). They can be disabled by specifying <code>&lt;exportedConfigs&gt;None&lt;/exportedConfigs&gt;</code> under <code>&lt;application&gt;</code>. If you want to explicitly specify what to publish you can use comma separated named such as <code>&lt;exportedConfigs&gt;storm-site,another-site&lt;/exportedConfigs&gt;</code>.</p>
+<p>By default all configurations are exported (e.g. <code>http://host1:44500/ws/v1/slider/publisher/slider/storm-site</code>). They can be disabled by specifying <code>&lt;exportedConfigs&gt;None&lt;/exportedConfigs&gt;</code> under <code>&lt;application&gt;</code>. If you want to explicitly specify what to publish you can use comma separated named such as <code>&lt;exportedConfigs&gt;storm-site,another-site&lt;/exportedConfigs&gt;</code>.</p>
 <h3 id="which-component-is-responsible-for-export">Which component is responsible for export</h3>
 <p>By default an arbitrary master is chosen as the master responsible for exporting the config. <em>What this means is that when this master is STARTED the applied config known at that time is exported</em>. Otherwise, you can specify which master component type should export configuration by specifying <code>&lt;publishConfig&gt;true&lt;/publishConfig&gt;</code> under <code>&lt;component&gt;</code>.</p>
 <h2 id="exporting-formatted-data-at-application-instance-level">Exporting formatted data at application instance level</h2>

Modified: websites/staging/slider/trunk/content/docs/ssl.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/ssl.html (original)
+++ websites/staging/slider/trunk/content/docs/ssl.html Wed Mar 25 17:59:38 2015
@@ -160,7 +160,24 @@ Latest release: <strong>0.60.0-incubatin
 
     <h1 class="title"></h1>
 
-    <h1 id="set-up-two-way-ssl-between-the-slider-agents-and-the-application-master">Set Up Two-Way SSL Between the Slider Agents and the Application Master</h1>
+    <p>/<em>
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ </em>
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ <em>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ </em>/</p>
+<h1 id="set-up-two-way-ssl-between-the-slider-agents-and-the-application-master">Set Up Two-Way SSL Between the Slider Agents and the Application Master</h1>
 <p>Two-way SSL provides a higher level of secure communication between the Slider Application Master and Agents by requiring both to verify each other's identify prior to the exchange of HTTP requests and responses. By default the communication mechanism between the two is One-Way SSL. To enable Two-way SSL:</p>
 <ul>
 <li>Edit the application configuration file for the application you intend to deploy</li>
@@ -177,7 +194,7 @@ Latest release: <strong>0.60.0-incubatin
 
 </li>
 <li>
-<p>Create and start the cluster (e.g. by using the slider command line leveraging the "create" option)</p>
+<p>Create and start the cluster (e.g. by using the slider command line and the "create" option)</p>
 </li>
 </ul>
   </div>