adjustments to security docs

git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk@1427299 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 1, 2013 · 3d6096d · 3d6096d
1 parent 31dac07
commit 3d6096d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt b/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt
@@ -10,6 +10,8 @@ Continuum Security Configuration
 
    * <<<~/.m2/security.properties>>>
 
+   * <<<$CONTINUUM_BASE/conf/security.properties>>>
+
    * <<<$CONTINUUM_HOME/conf/security.properties>>>
 
    []

diff --git a/continuum-docs/src/site/apt/administrator_guides/security/index.apt b/continuum-docs/src/site/apt/administrator_guides/security/index.apt
@@ -8,6 +8,6 @@
 
 Managing Users and Security
 
-    {{{./customising-security.html}Security Configuration}}
+    {{{./customising-security.html}Customising Security Configuration}}
 
     {{{./ldap.html}LDAP Configuration}}
diff --git a/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt b/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt
@@ -12,7 +12,8 @@ LDAP Configuration
 
     * Shutdown Continuum
 
-    * Add a security.properties files under $CONTINUUM_HOME/conf/ with the following content:
+    * Add a <<<security.properties>>> files under <<<$CONTINUUM_HOME/conf/>>> or <<<$CONTINUUM_BASE/conf>>> with the
+    following content:
 
 --------------------------------------------
 security.policy.password.expiration.enabled=false
@@ -30,10 +31,13 @@ ldap.config.mapper.attribute.fullname=givenName
 ldap.config.mapper.attribute.password=userPassword
 
 redback.default.admin=[adminuser]
-redback.default.guest=[guestuser]
+# Optional
+# redback.default.guest=[guestuser]
 --------------------------------------------
 
-    <<adminuser>> is a LDAP user and will be the default Continuum admin. <<guestuser>> is a LDAP user and will be used for the <<<guest>>> role, generally, it is an utility LDAP account.
+    <<adminuser>> is a LDAP user and will be the default Continuum admin.
+    <<guestuser>> is a LDAP user and will be used for the <<<guest>>> role, generally, it is an utility LDAP account.
+    If not specified, then a built-in guest account will be used.
 
     * Restart Continuum