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 2016/03/29 07:00:02 UTC
directory-fortress-core git commit: stop carrying the sudo pw in the
slapd setup
Repository: directory-fortress-core
Updated Branches:
refs/heads/master dcb796447 -> cdfb860ef
stop carrying the sudo pw in the slapd setup
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/cdfb860e
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/cdfb860e
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/cdfb860e
Branch: refs/heads/master
Commit: cdfb860ef76de676b562c9082d316a2dd361b694
Parents: dcb7964
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Mar 28 23:51:12 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Mar 28 23:51:12 2016 -0500
----------------------------------------------------------------------
build.xml | 5 -----
ldap/setup/install.sh | 16 +---------------
ldap/setup/stopSlapd.sh | 15 +--------------
slapd.properties.example | 4 ----
4 files changed, 2 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cdfb860e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9b8f746..49f9676 100644
--- a/build.xml
+++ b/build.xml
@@ -420,7 +420,6 @@
================================= -->
<target name="build" depends="clean,build-jar,build-jar-test,javadoc,javadoc-samples" description="--> create the core Fortress library">
<copy todir="${dist.dir}" file="${basedir}/LICENSE"/>
- <copy todir="${dist.dir}" file="${basedir}/LICENSE.slf4j.txt"/>
<copy todir="${dist.dir}" file="${basedir}/NOTICE"/>
</target>
@@ -1093,7 +1092,6 @@
<exec dir="." executable="/bin/sh">
<arg line="${uninstall.slapd.script}"/>
<arg value="${slapd.uninstall}"/>
- <arg value="${sudo.pw}"/>
</exec>
</target>
@@ -1132,7 +1130,6 @@
<exec dir="${openldap.install.artifact.dir}" executable="/bin/sh">
<arg line="${install.slapd.script}"/>
<arg value="${slapd.install}"/>
- <arg value="${sudo.pw}"/>
</exec>
</target>
@@ -1166,7 +1163,6 @@
<exec dir="." executable="/bin/sh">
<arg line="${start.slapd.script}"/>
<arg value="${slapd.start}"/>
- <arg value="${sudo.pw}"/>
</exec>
</target>
@@ -1185,7 +1181,6 @@
<echo message="############### Stop the slapd process"/>
<exec dir="." executable="/bin/sh">
<arg line="${stop.slapd.script}"/>
- <arg value="${sudo.pw}"/>
</exec>
</target>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cdfb860e/ldap/setup/install.sh
----------------------------------------------------------------------
diff --git a/ldap/setup/install.sh b/ldap/setup/install.sh
index 1b73d8a..8111464 100755
--- a/ldap/setup/install.sh
+++ b/ldap/setup/install.sh
@@ -19,19 +19,5 @@
#
export SLAPD_INSTALL="$1"
-
-if [ -z $2 ]
-then
- echo 'sudo NOT enabled'
-else
- export SUDO=true
- export SUPW=$2
- fi
-
echo 'install cds server ' $SLAPD_INSTALL
-if [ $SUDO ]
- then
- echo $SUPW | $SLAPD_INSTALL
- else
- $SLAPD_INSTALL
- fi
\ No newline at end of file
+$SLAPD_INSTALL
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cdfb860e/ldap/setup/stopSlapd.sh
----------------------------------------------------------------------
diff --git a/ldap/setup/stopSlapd.sh b/ldap/setup/stopSlapd.sh
index e961d00..d6aad66 100755
--- a/ldap/setup/stopSlapd.sh
+++ b/ldap/setup/stopSlapd.sh
@@ -17,14 +17,6 @@
# specific language governing permissions and limitations
# under the License.
#
-if [ -z $1 ]
-then
- echo 'sudo NOT enabled'
-else
- echo 'sudo enabled='$1
- export SUDO=true
- fi
-
SERVICE='slapd'
x=1
while [ $x -le 10 ]
@@ -33,12 +25,7 @@ do
if ps ax | grep -v grep | grep $SERVICE > /dev/null
then
echo 'stop the slapd server ' $a
- if [ $SUDO ]
- then
- echo $SUPW | sudo -S kill -HUP $(pidof $SERVICE)
- else
- kill -HUP $(/sbin/pidof $SERVICE)
- fi
+ kill -HUP $(pidof $SERVICE)
else
echo "$SERVICE has been stopped"
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cdfb860e/slapd.properties.example
----------------------------------------------------------------------
diff --git a/slapd.properties.example b/slapd.properties.example
index a02d0c1..f5b543b 100644
--- a/slapd.properties.example
+++ b/slapd.properties.example
@@ -47,10 +47,6 @@ root.dn=cn=Manager,${suffix}
root.pw={SSHA}pSOV2TpCxj2NMACijkcMko4fGrFopctU
cfg.root.pw=secret
-# Set sudo.pw is used by 'init-slapd', 'start-slapd' and 'stop-slapd' tagets on Linux machine when sudo access required, otherwise leave this value blank
-# The sudo.pw variable must be uncommented and left empty iff installing Symas-OpenLDAP package onto Redhat Linux platform:
-#sudo.pw=
-
########################################################################
# 2. BEGIN OPENLDAP SERVER CONFIGURATION SECTION: (Ignore if using HTTP or ApacheDS):
####################################################################################