You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/10/15 03:03:41 UTC

directory-fortress-core git commit: correct eror in apache directory setup instructions

Repository: directory-fortress-core
Updated Branches:
  refs/heads/master cc76d2e84 -> 174c01cd5


correct eror in apache directory setup instructions


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/174c01cd
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/174c01cd
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/174c01cd

Branch: refs/heads/master
Commit: 174c01cd5fc672bd2d803edc78959afb4a182709
Parents: cc76d2e
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Oct 2 21:45:00 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Oct 2 21:45:00 2015 -0500

----------------------------------------------------------------------
 ldap/schema/apacheds-ldaps.ldif                 | 30 ++++++++++++++++++++
 .../core/doc-files/apache-directory-server.html | 10 +++----
 .../core/doc-files/apache-directory-studio.html | 14 ++++-----
 3 files changed, 41 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/174c01cd/ldap/schema/apacheds-ldaps.ldif
----------------------------------------------------------------------
diff --git a/ldap/schema/apacheds-ldaps.ldif b/ldap/schema/apacheds-ldaps.ldif
new file mode 100644
index 0000000..fdd163e
--- /dev/null
+++ b/ldap/schema/apacheds-ldaps.ldif
@@ -0,0 +1,30 @@
+######################################################################
+#
+#
+#   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
+#
+#     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.
+#
+#
+# Modify keystore setting in apacheds:
+dn: ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=con
+ fig
+changetype: modify
+replace: ads-keystoreFile
+ads-keystorefile: /var/lib/apacheds-2.0.0-M20/default/conf/mykeystore
+-
+replace: ads-certificatepassword
+ads-certificatepassword:: Y2hhbmdlaXQ=
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/174c01cd/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
index 3457f23..2409fbd 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
@@ -50,16 +50,16 @@ Steps to install:
     <li>
         Download and install Apache Directory Server
         <br/><br/>
-        For 32-bit (as root):
+        For 32-bit (as sudo or root):
         <pre>
           <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
 wget http://www.trieuvan.com/apache//directory/apacheds/dist/2.0.0-M20/apacheds-2.0.0-M20-32bit.bin
 chmod a+x *.bin
-./apacheds-2.0.0-M20-64bit.bin
+./apacheds-2.0.0-M20-32bit.bin
           </p>
         </pre>
 
-        For 64-bit (as root):
+        For 64-bit (as sudo or root):
         <pre>
           <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
 wget http://www.trieuvan.com/apache//directory/apacheds/dist/2.0.0-M20/apacheds-2.0.0-M20-64bit.bin
@@ -109,7 +109,7 @@ wrapper.java.command=/path/java/bin/java
     <li>
         After installation start the directory server process.
 
-        From system command prompt (as root):
+        From system command prompt (as sudo or root):
         <pre>
           <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
 /etc/init.d/apacheds-2.0.0-M20-default start
@@ -120,7 +120,7 @@ wrapper.java.command=/path/java/bin/java
     <li>
         Check the status of server process.
 
-        From system command prompt (as root):
+        From system command prompt (as sudo or root):
         <pre>
           <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
 /etc/init.d/apacheds-2.0.0-M20-default status ApacheDS - default is running (70041).

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/174c01cd/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
index 9542ca9..97482a5 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
@@ -53,19 +53,17 @@ Steps to install:
         For 32-bit:
         <pre>
             <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-wget
-http://mirrors.ibiblio.org/apache//directory/studio/dist/2.0.0.v20130628/ApacheDirectoryStudio-linux-x86-2.0.0.v20130628.tar.gz
-tar xvf ApacheDirectoryStudio-linux-x86-2.0.0.v20130628.tar.gz
-cd ApacheDirectoryStudio-linux-x86-2.0.0.v20130628/
+wget http://mirror.metrocast.net/apache/directory/studio/2.0.0.v20150606-M9/ApacheDirectoryStudio-2.0.0.v20150606-M9-linux.gtk.x86.tar.gz
+tar xvf ApacheDirectoryStudio-2.0.0.v20150606-M9-linux.gtk.x86.tar.gz
+cd ApacheDirectoryStudio/
             </p>
         </pre>
         For 64-bit:
         <pre>
             <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-wget
-http://mirrors.ibiblio.org/apache//directory/studio/dist/2.0.0.v20130628/ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628.tar.gz
-tar xvf ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628.tar.gz
-cd ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628/
+wget http://mirror.metrocast.net/apache/directory/studio/2.0.0.v20150606-M9/ApacheDirectoryStudio-2.0.0.v20150606-M9-linux.gtk.x86_64.tar.gz
+tar xvf ApacheDirectoryStudio-2.0.0.v20150606-M9-linux.gtk.x86_64.tar.gz
+cd ApacheDirectoryStudio/
             </p>
         </pre>
     </li>