You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/05/26 20:57:53 UTC
svn commit: r1745643 [2/2] - in
/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT: ./
assets/themes/zeppelin/img/docs-img/ development/ displaysystem/ install/
interpreter/ manual/ rest-api/ security/ storage/ tutorial/ ui_layout/
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/dynamicinterpreterload.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/dynamicinterpreterload.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/dynamicinterpreterload.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/dynamicinterpreterload.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/interpreters.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/interpreters.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/interpreters.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/interpreters.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/notebookashomepage.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/notebookashomepage.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/notebookashomepage.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/notebookashomepage.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/publish.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/publish.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/publish.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/publish.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/pleasecontribute.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/pleasecontribute.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/pleasecontribute.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/pleasecontribute.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-configuration.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-configuration.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-configuration.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-configuration.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-interpreter.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-interpreter.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-interpreter.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-interpreter.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-notebook.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-notebook.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-notebook.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-notebook.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml Thu May 26 20:57:52 2016
@@ -5,8 +5,8 @@
<description>Apache Zeppelin (incubating) - The Apache Software Foundation</description>
<link>http://zeppelin.incubator.apache.org</link>
<link>http://zeppelin.incubator.apache.org</link>
- <lastBuildDate>2016-05-24T17:11:07-07:00</lastBuildDate>
- <pubDate>2016-05-24T17:11:07-07:00</pubDate>
+ <lastBuildDate>2016-05-26T13:56:49-07:00</lastBuildDate>
+ <pubDate>2016-05-26T13:56:49-07:00</pubDate>
<ttl>1800</ttl>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/screenshots.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/screenshots.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/screenshots.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/screenshots.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html Thu May 26 20:57:52 2016
@@ -3,8 +3,8 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>Authentication</title>
- <meta name="description" content="Authentication">
+ <title>Authentication for NGINX</title>
+ <meta name="description" content="Authentication for NGINX">
<meta name="author" content="The Apache Software Foundation">
<!-- Enable responsive viewport -->
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
@@ -158,7 +156,7 @@
<div class="container">
-<!--<div class="hero-unit Authentication">
+<!--<div class="hero-unit Authentication for NGINX">
<h1></h1>
</div>
-->
@@ -179,7 +177,7 @@ See the License for the specific languag
limitations under the License.
-->
-<h1>Authentication</h1>
+<h1>Authentication for NGINX</h1>
<p>Authentication is company-specific.</p>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/overview.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/overview.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/overview.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/overview.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Added: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html?rev=1745643&view=auto
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html (added)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html Thu May 26 20:57:52 2016
@@ -0,0 +1,257 @@
+
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <title>Shiro Security for Apache Zeppelin</title>
+ <meta name="description" content="">
+ <meta name="author" content="The Apache Software Foundation">
+
+ <!-- Enable responsive viewport -->
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+
+ <!-- Le styles -->
+ <link href="/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/bootstrap/css/bootstrap.css" rel="stylesheet">
+ <link href="/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/css/style.css?body=1" rel="stylesheet" type="text/css">
+ <link href="/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/css/syntax.css" rel="stylesheet" type="text/css" media="screen" />
+ <!-- Le fav and touch icons -->
+ <!-- Update these with your own images
+ <link rel="shortcut icon" href="images/favicon.ico">
+ <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
+ -->
+
+ <!-- Js -->
+ <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
+ <script src="/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/bootstrap/js/bootstrap.min.js"></script>
+ <script src="/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/js/docs.js"></script>
+
+ <!-- atom & rss feed -->
+ <link href="/docs/0.6.0-incubating-SNAPSHOT/atom.xml" type="application/atom+xml" rel="alternate" title="Sitewide ATOM Feed">
+ <link href="/docs/0.6.0-incubating-SNAPSHOT/rss.xml" type="application/rss+xml" rel="alternate" title="Sitewide RSS Feed">
+ </head>
+
+ <body>
+
+ <div id="menu" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/docs/0.6.0-incubating-SNAPSHOT">
+ <img src="/assets/themes/zeppelin/img/zeppelin_logo.png" width="50" alt="I'm zeppelin">
+ <span style="vertical-align:middle">Zeppelin</span>
+ <span style="vertical-align:baseline"><small>(0.6.0-incubating-SNAPSHOT)</small></span>
+ </a>
+ </div>
+ <nav class="navbar-collapse collapse" role="navigation">
+ <ul class="nav navbar-nav">
+ <li>
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Quick Start <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <!-- li><span><b>Overview</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/index.html">Overview</a></li>
+ <li role="separator" class="divider"></li>
+ <!-- li><span><b>Install</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/install/install.html">Install</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/install/yarn_install.html">YARN Install</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/install/virtual_machine.html">Virtual Machine Install</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/install/upgrade.html">Upgrade Version</a></li>
+ <li role="separator" class="divider"></li>
+ <!-- li><span><b>Tutorial</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/tutorial/tutorial.html">Tutorial</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/ui_layout/zeppelin_layout.html">UI Layout</a></li>
+ <li role="separator" class="divider"></li>
+ <!-- li><span><b>Guide</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/dynamicform.html">Dynamic Form</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/publish.html">Publish your Paragraph</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Interpreter <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/interpreters.html">Overview</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/alluxio.html">Alluxio</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/cassandra.html">Cassandra</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/elasticsearch.html">Elasticsearch</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/flink.html">Flink</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/geode.html">Geode</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/hbase.html">HBase</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/hdfs.html">HDFS</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/hive.html">Hive</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/ignite.html">Ignite</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/jdbc.html">JDBC</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/lens.html">Lens</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/livy.html">Livy</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/markdown.html">Markdown</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/postgresql.html">Postgresql, hawq</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/r.html">R</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/scalding.html">Scalding</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/pleasecontribute.html">Shell</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/interpreter/spark.html">Spark</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/pleasecontribute.html">Tajo</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/dynamicinterpreterload.html">Dynamic Interpreter Loading</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/dependencymanagement.html">Interpreter Dependency Management</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Display System <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/displaysystem/display.html">Text</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/displaysystem/display.html#html">Html</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/displaysystem/table.html">Table</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/displaysystem/back-end-angular.html">Angular (backend API)</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/displaysystem/front-end-angular.html">Angular (frontend API)</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="#" data-toggle="dropdown" class="dropdown-toggle">More <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <!-- li><span><b>Manual</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/notebookashomepage.html">Notebook as Homepage</a></li>
+ <li role="separator" class="divider"></li>
+ <!-- li><span><b>Notebook Storage</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/storage/storage.html#Git">Git Storage</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/storage/storage.html#S3">S3 Storage</a></li>
+ <li role="separator" class="divider"></li>
+ <!-- li><span><b>REST API</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-interpreter.html">Interpreter API</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-notebook.html">Notebook API</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-configuration.html">Configuration API</a></li>
+ <li role="separator" class="divider"></li>
+ <!-- li><span><b>Security</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
+ <li role="separator" class="divider"></li>
+ <!-- li><span><b>Development</b><span></li -->
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
+ </ul>
+ </li>
+ </ul>
+ </nav><!--/.navbar-collapse -->
+ </div>
+ </div>
+
+
+ <div class="container">
+
+<!--<div class="hero-unit Shiro Security for Apache Zeppelin">
+ <h1></h1>
+</div>
+-->
+
+<div class="row">
+ <div class="col-md-12">
+ <!--
+Licensed 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
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+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.
+-->
+
+<h1>Shiro authentication for Apache Zeppelin</h1>
+
+<p><a href="http://shiro.apache.org/">Apache Shiro</a> is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management. In this documentation, we will explain step by step how Shiro works for Zeppelin notebook authentication.</p>
+
+<p>When you connect to Apache Zeppelin, you will be asked to enter your credentials. Once you logged in, then you have access to all notes including other user's notes.</p>
+
+<h2>Security Setup</h2>
+
+<p>You can setup <strong>Zeppelin notebook authentication</strong> in some simple steps.</p>
+
+<h4>1. Secure the HTTP channel</h4>
+
+<p>To secure the HTTP channel, you have to change both <strong>anon</strong> and <strong>authcBasic</strong> settings in <code>conf/shiro.ini</code>. In here, <strong>anon</strong> means "the access is anonymous" and <strong>authcBasic</strong> means "basic auth security".</p>
+
+<p>The default status of them is</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">/** = anon
+#/** = authcBasic
+</code></pre></div>
+<p>Deactivate the line "/** = anon" and activate the line "/** = authcBasic" in <code>conf/shiro.ini</code> file.</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">#/** = anon
+/** = authcBasic
+</code></pre></div>
+<p>For the further information about <code>shiro.ini</code> file format, please refer to <a href="http://shiro.apache.org/configuration.html#Configuration-INISections">Shiro Configuration</a>.</p>
+
+<h4>2. Secure the Websocket channel</h4>
+
+<p>Set to property <strong>zeppelin.anonymous.allowed</strong> to <strong>false</strong> in <code>conf/zeppelin-site.xml</code>. If you don't have this file yet, just copy <code>conf/zeppelin-site.xml.template</code> to <code>conf/zeppelin-site.xml</code>.</p>
+
+<h4>3. Start Zeppelin</h4>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">bin/zeppelin-daemon.sh start (or restart)
+</code></pre></div>
+<p>Then you can browse Zeppelin at <a href="http://localhost:8080">http://localhost:8080</a>.</p>
+
+<h4>4. Login</h4>
+
+<p>Finally, you can login using one of the below <strong>username/password</strong> combinations.</p>
+
+<p><center><img src="../assets/themes/zeppelin/img/docs-img/zeppelin-login.png"></center></p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">admin = password1
+user1 = password2
+user2 = password3
+</code></pre></div>
+<p>Those combinations are defined in the <code>conf/shiro.ini</code> file.</p>
+
+<blockquote>
+<p><strong>NOTE :</strong> This documentation is originally from <a href="https://github.com/apache/incubator-zeppelin/blob/master/SECURITY-README.md">SECURITY-README.md</a>.</p>
+</blockquote>
+
+ </div>
+</div>
+
+
+ <hr>
+ <footer>
+ <!-- <p>© 2016 The Apache Software Foundation</p>-->
+ </footer>
+ </div>
+
+
+
+
+ <script type="text/javascript">
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ ga('create', 'UA-45176241-5', 'zeppelin.incubator.apache.org');
+ ga('require', 'linkid', 'linkid.js');
+ ga('send', 'pageview');
+
+</script>
+
+
+
+ </body>
+</html>
+
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/sitemap.txt
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/sitemap.txt?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/sitemap.txt (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/sitemap.txt Thu May 26 20:57:52 2016
@@ -2,6 +2,7 @@
http://zeppelin.incubator.apache.org/atom.xml
http://zeppelin.incubator.apache.org/development/howtocontribute.html
http://zeppelin.incubator.apache.org/development/howtocontributewebsite.html
+http://zeppelin.incubator.apache.org/development/writingheliumapplication.html
http://zeppelin.incubator.apache.org/development/writingzeppelininterpreter.html
http://zeppelin.incubator.apache.org/displaysystem/back-end-angular.html
http://zeppelin.incubator.apache.org/displaysystem/display.html
@@ -35,7 +36,6 @@ http://zeppelin.incubator.apache.org/man
http://zeppelin.incubator.apache.org/manual/interpreters.html
http://zeppelin.incubator.apache.org/manual/notebookashomepage.html
http://zeppelin.incubator.apache.org/manual/publish.html
-http://zeppelin.incubator.apache.org/manual/shiroauthentication.html
http://zeppelin.incubator.apache.org/pleasecontribute.html
http://zeppelin.incubator.apache.org/rest-api/rest-configuration.html
http://zeppelin.incubator.apache.org/rest-api/rest-interpreter.html
@@ -46,6 +46,7 @@ http://zeppelin.incubator.apache.org/sec
http://zeppelin.incubator.apache.org/security/interpreter_authorization.html
http://zeppelin.incubator.apache.org/security/notebook_authorization.html
http://zeppelin.incubator.apache.org/security/overview.html
+http://zeppelin.incubator.apache.org/security/shiroauthentication.html
http://zeppelin.incubator.apache.org/sitemap.txt
http://zeppelin.incubator.apache.org/storage/storage.html
http://zeppelin.incubator.apache.org/tutorial/tutorial.html
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/storage/storage.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/storage/storage.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/storage/storage.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/storage/storage.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
@@ -182,12 +180,12 @@ limitations under the License.
<h3>Notebook Storage</h3>
<p>Zeppelin has a pluggable notebook storage mechanism controlled by <code>zeppelin.notebook.storage</code> configuration option with multiple implementations.
-There are few Notebook storages available for a use out of the box:
+There are few Notebook storage systems available for a use out of the box:
- (default) all notes are saved in the notebook folder in your local File System - <code>VFSNotebookRepo</code>
- there is also an option to version it using local Git repository - <code>GitNotebookRepo</code>
- - another option is Amazon S3 service - <code>S3NotebookRepo</code></p>
+ - another option is Amazon's S3 service - <code>S3NotebookRepo</code></p>
-<p>Multiple storages can be used at the same time by providing a comma-separated list of the class-names in the configuration.
+<p>Multiple storage systems can be used at the same time by providing a comma-separated list of the class-names in the configuration.
By default, only first two of them will be automatically kept in sync by Zeppelin.</p>
<p></br></p>
@@ -205,45 +203,79 @@ By default, only first two of them will
<h4>Notebook Storage in S3 <a name="S3"></a></h4>
-<p>For notebook storage in S3 you need the AWS credentials, for this there are three options, the environment variable <code>AWS_ACCESS_KEY_ID</code> and <code>AWS_ACCESS_SECRET_KEY</code>, credentials file in the folder .aws in you home and IAM role for your instance. For complete the need steps is necessary:</p>
+<p>Notebooks may be stored in S3, and optionally encrypted. The <a href="https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html"><code>DefaultAWSCredentialsProviderChain</code></a> credentials provider is used for credentials and checks the following:</p>
+
+<ul>
+<li>The <code>AWS_ACCESS_KEY_ID</code> and <code>AWS_SECRET_ACCESS_KEY</code> environment variables</li>
+<li>The <code>aws.accessKeyId</code> and <code>aws.secretKey</code> Java System properties</li>
+<li>Credential profiles file at the default location (<code>~/.aws/credentials</code>) used by the AWS CLI</li>
+<li>Instance profile credentials delivered through the Amazon EC2 metadata service</li>
+</ul>
<p></br>
-you need the following folder structure on S3</p>
-<div class="highlight"><pre><code class="text language-text" data-lang="text">bucket_name/
- username/
- notebook/
+The following folder structure will be created in S3:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">s3://bucket_name/username/notebook-id/
</code></pre></div>
-<p>set the environment variable in the file <strong>zeppelin-env.sh</strong>:</p>
+<p>Configure by setting environment variables in the file <strong>zeppelin-env.sh</strong>:</p>
<div class="highlight"><pre><code class="text language-text" data-lang="text">export ZEPPELIN_NOTEBOOK_S3_BUCKET = bucket_name
export ZEPPELIN_NOTEBOOK_S3_USER = username
</code></pre></div>
-<p>in the file <strong>zeppelin-site.xml</strong> uncomment and complete the next property:</p>
-<div class="highlight"><pre><code class="text language-text" data-lang="text"><!--If used S3 to storage, it is necessary the following folder structure bucket_name/username/notebook/-->
+<p>Or using the file <strong>zeppelin-site.xml</strong> uncomment and complete the S3 settings:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text"><property>
+ <name>zeppelin.notebook.s3.bucket</name>
+ <value>bucket_name</value>
+ <description>bucket name for notebook storage</description>
+</property>
<property>
<name>zeppelin.notebook.s3.user</name>
<value>username</value>
<description>user name for s3 folder structure</description>
</property>
-<property>
- <name>zeppelin.notebook.s3.bucket</name>
- <value>bucket_name</value>
- <description>bucket name for notebook storage</description>
-</property>
</code></pre></div>
-<p>uncomment the next property for use S3NotebookRepo class:</p>
+<p>Uncomment the next property for use S3NotebookRepo class:</p>
<div class="highlight"><pre><code class="text language-text" data-lang="text"><property>
<name>zeppelin.notebook.storage</name>
<value>org.apache.zeppelin.notebook.repo.S3NotebookRepo</value>
<description>notebook persistence layer implementation</description>
</property>
</code></pre></div>
-<p>comment the next property:</p>
+<p>Comment out the next property to disable local notebook storage (the default):</p>
<div class="highlight"><pre><code class="text language-text" data-lang="text"><property>
<name>zeppelin.notebook.storage</name>
<value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
<description>notebook persistence layer implementation</description>
</property>
</code></pre></div>
+<h4>Data Encryption in S3</h4>
+
+<h5>AWS KMS encryption keys</h5>
+
+<p>To use an <a href="https://aws.amazon.com/kms/">AWS KMS</a> encryption key to encrypt notebooks, set the following environment variable in the file <strong>zeppelin-env.sh</strong>:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">export ZEPPELIN_NOTEBOOK_S3_KMS_KEY_ID = kms-key-id
+</code></pre></div>
+<p>Or using the following setting in <strong>zeppelin-site.xml</strong>:
+<code>
+<property>
+ <name>zeppelin.notebook.s3.kmsKeyID</name>
+ <value>AWS-KMS-Key-UUID</value>
+ <description>AWS KMS key ID used to encrypt notebook data in S3</description>
+</property>
+</code></p>
+
+<h5>Custom Encryption Materials Provider class</h5>
+
+<p>You may use a custom <a href="https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/services/s3/model/EncryptionMaterialsProvider.html"><code>EncryptionMaterialsProvider</code></a> class as long as it is available in the classpath and able to initialize itself from system properties or another mechanism. To use this, set the following environment variable in the file <strong>zeppelin-env.sh</strong>:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">export ZEPPELIN_NOTEBOOK_S3_EMP = class-name
+</code></pre></div>
+<p>Or using the following setting in <strong>zeppelin-site.xml</strong>:
+<code>
+<property>
+ <name>zeppelin.notebook.s3.encryptionMaterialsProvider</name>
+ <value>provider implementation class name</value>
+ <description>Custom encryption materials provider used to encrypt notebook data in S3</description>
+</property>
+</code></p>
+
</div>
</div>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/tutorial/tutorial.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/tutorial/tutorial.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/tutorial/tutorial.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/tutorial/tutorial.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>
Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/ui_layout/zeppelin_layout.html
URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/ui_layout/zeppelin_layout.html?rev=1745643&r1=1745642&r2=1745643&view=diff
==============================================================================
--- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/ui_layout/zeppelin_layout.html (original)
+++ incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/ui_layout/zeppelin_layout.html Thu May 26 20:57:52 2016
@@ -137,7 +137,8 @@
<li role="separator" class="divider"></li>
<!-- li><span><b>Security</b><span></li -->
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/overview.html">Security Overview</a></li>
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html">Authentication for NGINX</a></li>
+ <li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/shiroauthentication.html">Shiro Authentication</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html">Notebook Authorization</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html">Interpreter Authorization</a></li>
<li role="separator" class="divider"></li>
@@ -145,9 +146,6 @@
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html">How to contribute (code)</a></li>
<li><a href="/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html">How to contribute (website)</a></li>
- <li role="separator" class="divider"></li>
- <!-- li><span><b>Shiro Security</b><span></li -->
- <li><a href="/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html">Shiro Authentication</a></li>
</ul>
</li>
</ul>