[debian-edu-commits] debian-edu/ 01/01: Adjust cf/cf.krb5client to avoid overwriting /etc/krb5.conf on the main server during upgrades. (Closes: #779642).

[Wolfgang Schweer]

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

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

commit d3469ec1ed2c3a8f661de0a7df0cdef067f913ed
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Mar 10 18:27:27 2015 +0100

    Adjust cf/cf.krb5client to avoid overwriting /etc/krb5.conf on the main server during upgrades. (Closes: #779642).
---
 cf/cf.krb5client | 4 ++--
 debian/changelog | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cf/cf.krb5client b/cf/cf.krb5client
index 1f2932f..8edfaa2 100644
--- a/cf/cf.krb5client
+++ b/cf/cf.krb5client
@@ -7,8 +7,8 @@ links:
         /usr/share/pam-configs/edu-nopwdchange ->! /usr/share/debian-edu-config/pam-config-nopwdchange
 
 shellcommands:
-    # setup-roaming generate its own krb5.conf, no need to do it here.
-    debian.installation.!standalone.!roaming::
+    # setup-roaming generate its own krb5.conf, no need to do it here. same applies to the main server.
+    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 cd15708..330a7a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-config (1.818) UNRELEASED; urgency=medium
+
+  * Adjust cf/cf.krb5client to avoid overwriting /etc/krb5.conf on the
+    main server during upgrades. (Closes: #779642).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 10 Mar 2015 18:23:11 +0100
+
 debian-edu-config (1.817) unstable; urgency=medium
 
   [ Wolfgang Schweer ]

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