[debian-edu-commits] debian-edu/ 01/01: Fix path to secrets.tdb in ldap-debian-edu-install.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 89689ae6a84da01a61bdb3c58c0d11dee2ecd675
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Aug 22 12:38:01 2014 +0200

    Fix path to secrets.tdb in ldap-debian-edu-install.
---
 debian/changelog                   | 1 +
 ldap-tools/ldap-debian-edu-install | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9b5df19..e29c230 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ debian-edu-config (1.721) UNRELEASED; urgency=low
   [ Wolfgang Schweer ]
   * Update setup instructions in ldap-debian-edu-install to enable password
     storage in secrets.tdb (new location: /var/lib/samba/private/).
+  * Fix path to secrets.tdb in ldap-debian-edu-install.
 
  -- Alexander Alemayhu <alexander at bitraf.no>  Thu, 21 Aug 2014 22:51:52 +0200
 
diff --git a/ldap-tools/ldap-debian-edu-install b/ldap-tools/ldap-debian-edu-install
index e33d657..10365dd 100755
--- a/ldap-tools/ldap-debian-edu-install
+++ b/ldap-tools/ldap-debian-edu-install
@@ -468,7 +468,7 @@ EOF
     SAMBASID=`net -s /etc/samba/smb.conf getdomainsid 2>/dev/null | awk '/SKOLELINUX/ { print $6 }'`
 
     # start from scratch with secrets.tdb...
-    rm -f /var/lib/samba/secrets.tdb
+    rm -f /var/lib/samba/private/secrets.tdb
 
 
     # remove the bootstrap smb.conf again... this file was really temporary...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git