[debian-edu-commits] debian-edu/ 01/01: Adjust cf.krb5client to ensure that cfengine runs are idempotent. (Closes: #779642) - Patch taken from master branch from Wolfgang.

[Holger Levsen]

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

holger pushed a commit to branch jessie
in repository debian-edu-config.

commit 94ec61ad5c3b0786a606fc939f94ee1d964a4984
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jul 18 15:56:01 2016 +0200

    Adjust cf.krb5client to ensure that cfengine runs are idempotent. (Closes: #779642) - Patch taken from master branch from Wolfgang.
---
 cf/cf.krb5client | 2 +-
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cf/cf.krb5client b/cf/cf.krb5client
index 1f2932f..2e886c8 100644
--- a/cf/cf.krb5client
+++ b/cf/cf.krb5client
@@ -8,7 +8,7 @@ links:
 
 shellcommands:
     # setup-roaming generate its own krb5.conf, no need to do it here.
-    debian.installation.!standalone.!roaming::
+    debian.installation.!standalone.!roaming.!server::
 	"/usr/share/debian-edu-config/tools/sssd-generate-config -k > /etc/krb5.conf"
 
     debian.installation.!standalone.secondpass::
diff --git a/debian/changelog b/debian/changelog
index 0aeec74..2df91a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
   * Move code to cleanup /usr/share/pam-configs/krb5 diversion from postinst
     to preinst to ease upgrades from old wheezy installations.
     (Closes: #779641)
+  * Adjust cf.krb5client to ensure that cfengine runs are idempotent.
+    (Closes: #779642) - Patch taken from master branch from Wolfgang.
 
  -- Holger Levsen <holger at debian.org>  Tue, 31 May 2016 11:23:33 +0200
 

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