[debian-edu-commits] debian-edu/ 01/01: Move ldap-server-getcert, which is only used by one of our scripts, from /usr/bin to /usr/share/debian-edu-config/tools/.
Holger Levsen
holger at layer-acht.org
Mon Jul 18 14:41:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-config.
commit 72041821384a9c123b9d163cd28793b5ad49c6d0
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Jul 18 16:41:08 2016 +0200
Move ldap-server-getcert, which is only used by one of our scripts, from /usr/bin to /usr/share/debian-edu-config/tools/.
---
Makefile | 2 +-
debian/changelog | 2 ++
debian/debian-edu-config.fetch-ldap-cert | 2 +-
{ldap-tools => share/debian-edu-config/tools}/ldap-server-getcert | 0
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 4911c68..0141240 100644
--- a/Makefile
+++ b/Makefile
@@ -234,7 +234,6 @@ LDAPPROGRAMS = \
ldappasswd2 \
ldap2netgroup \
ldap-debian-edu-install \
- ldap-server-getcert \
mkslapdcert \
sitesummary2ldapdhcp
@@ -395,6 +394,7 @@ install: install-testsuite
share/debian-edu-config/tools/wpad-extract \
share/debian-edu-config/tools/debian-edu-dovecot-create-cert \
share/debian-edu-config/tools/migrate-squid-to-squid3 \
+ share/debian-edu-config/tools/ldap-server-getcert \
share/debian-edu-config/ltspfs-mounter-kde \
share/ltsp/get-ldap-ltsp-config \
share/ltsp/init-ltsp.d/08-edu-hostname \
diff --git a/debian/changelog b/debian/changelog
index 4473675..a3e1589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ debian-edu-config (1.906) UNRELEASED; urgency=medium
(Closes: #801776)
* Drop undocumented script debian-edu-hd-warn which is much better replaced
with munin or other monitoring. The script was also not run from cron.
+ * Move ldap-server-getcert, which is only used by one of our scripts, from
+ /usr/bin to /usr/share/debian-edu-config/tools/.
-- Mike Gabriel <sunweaver at debian.org> Thu, 07 Jul 2016 12:01:08 +0200
diff --git a/debian/debian-edu-config.fetch-ldap-cert b/debian/debian-edu-config.fetch-ldap-cert
index 4ba6ab8..e34f071 100644
--- a/debian/debian-edu-config.fetch-ldap-cert
+++ b/debian/debian-edu-config.fetch-ldap-cert
@@ -38,7 +38,7 @@ do_start() {
return 1
fi
[ "$VERBOSE" != no ] && log_action_begin_msg "Fetching LDAP SSL certificate."
- ldap-server-getcert $LDAPSERVER > $CERTFILE.new
+ /usr/share/debian-edu-config/tools/ldap-server-getcert $LDAPSERVER > $CERTFILE.new
chmod 644 $CERTFILE.new
if test -s $CERTFILE.new ; then
mv $CERTFILE.new $CERTFILE
diff --git a/ldap-tools/ldap-server-getcert b/share/debian-edu-config/tools/ldap-server-getcert
similarity index 100%
rename from ldap-tools/ldap-server-getcert
rename to share/debian-edu-config/tools/ldap-server-getcert
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list