[debian-edu-commits] debian-edu/ 01/01: Adjust cf.krb5client to ensure that cfengine runs are idempotent. Adjust cf.squid (squid3 has been renamed to squid). Adjust cf.homes to make sure that autofs doesn't run on the main server.

[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 95b293d145839076e12b3ba93615cc2e3a456cf6
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Apr 14 23:41:42 2016 +0200

    Adjust cf.krb5client to ensure that cfengine runs are idempotent. Adjust cf.squid (squid3 has been renamed to squid). Adjust cf.homes to make sure that autofs doesn't run on the main server.
---
 cf/cf.homes      | 14 +++++---------
 cf/cf.krb5client |  2 +-
 cf/cf.squid      | 16 +++++++++-------
 debian/changelog |  8 ++++++++
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/cf/cf.homes b/cf/cf.homes
index 209335e..6672791 100644
--- a/cf/cf.homes
+++ b/cf/cf.homes
@@ -68,15 +68,6 @@ editfiles:
         AppendIfNoSuchLine "LDAPURI=ldap://$(ldapserver)"
       }
 
-    # Make sure to disable autofs on the main-server, to avoid hiding
-    # local file systems.
-    debian.server::
-
-      { /etc/default/autofs
-        AppendIfNoSuchLine "exit 0"
-      }
-
-
     # Just by logging in, each user by default fill up 144 MiB of disk
     # space.  Most of it is spend by akonadi.  Following instructions
     # in
@@ -96,3 +87,8 @@ editfiles:
         AppendIfNoSuchLine "MENUREORDER=true"
       }
 
+shellcommands:
+    # Make sure to disable autofs on the main-server, to avoid hiding
+    # local file systems.
+    debian.server::
+        "/bin/systemctl disable autofs"
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/cf/cf.squid b/cf/cf.squid
index a411725..d2a6ba7 100644
--- a/cf/cf.squid
+++ b/cf/cf.squid
@@ -4,21 +4,21 @@ links:
                 /etc/iceweasel/pref/debian-edu-networked.js ->
                 /usr/share/debian-edu-config/iceweacel-networked-prefs.js nofile=force
 
-# Configure squid, copy our setup to /etc/squid3/ (instead of
+# Configure squid, copy our setup to /etc/squid/ (instead of
 # including it in the package as a conffile), to ensure package
 # upgrades do not trigger a conffile question from dpkg.
 directories:
    debian.server::
-    /etc/squid3 mode=755 owner=root group=root  
+    /etc/squid mode=755 owner=root group=root
 copy:
    debian.server::
-    /usr/share/debian-edu-config/squid3.conf dest=/etc/squid3/squid-debian-edu.conf mode=0644
+    /usr/share/debian-edu-config/squid.conf dest=/etc/squid/squid-debian-edu.conf mode=0644
 editfiles:
    debian.server::
-    { /etc/default/squid3
+    { /etc/default/squid
       AutoCreate
-      AppendIfNoSuchLine "CONFIG=/etc/squid3/squid-debian-edu.conf"
-      AppendIfNoSuchLine "SQUID_ARGS=\"-YC -f /etc/squid3/squid-debian-edu.conf\""
+      AppendIfNoSuchLine "CONFIG=/etc/squid/squid-debian-edu.conf"
+      AppendIfNoSuchLine "SQUID_ARGS=\"-YC -f /etc/squid/squid-debian-edu.conf\""
     }
 
 
@@ -35,7 +35,9 @@ shellcommands:
    debian.server::
 
     # Update Squid to use all the available space (aka 80% of the partition)
-    "/usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid3/squid-debian-edu.conf"
+    "/usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid/squid-debian-edu.conf"
+    # Migrate to squid3 when ugrading to jessie.
+    #"/usr/share/debian-edu-config/tools/migrate-squid-to-squid3"
 
    debian.!server.!standalone.fifthpass::
 
diff --git a/debian/changelog b/debian/changelog
index 42bb1b5..72de4ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-config (1.901) UNRELEASED; urgency=medium
+
+  * Adjust cf.krb5client to ensure that cfengine runs are idempotent.
+  * Adjust cf.squid (squid3 has been renamed to squid).
+  * Adjust cf.homes to make sure that autofs doesn't run on the main server.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 14 Apr 2016 23:32:10 +0200
+
 debian-edu-config (1.900) 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