[debian-edu-commits] r81296 - in branches/wheezy/debian-edu-config: cf debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-02 10:02:57 +0000 (Tue, 02 Jul 2013)
New Revision: 81296

Modified:
   branches/wheezy/debian-edu-config/cf/cf.syslog
   branches/wheezy/debian-edu-config/cf/cfengine.conf
   branches/wheezy/debian-edu-config/debian/changelog
Log:
Correct cfengine setup to set files.secondpass on the second files
pass.

Modified: branches/wheezy/debian-edu-config/cf/cf.syslog
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.syslog	2013-07-02 10:01:01 UTC (rev 81295)
+++ branches/wheezy/debian-edu-config/cf/cf.syslog	2013-07-02 10:02:57 UTC (rev 81296)
@@ -37,6 +37,6 @@
       AppendIfNoSuchLine "*.* @${syslogserver}"
     }
 
-files:
+files.secondpass:
   debian.!server.!standalone::
 	/etc/rsyslog.d/debian-edu-client.conf mode=644 act=fixall

Modified: branches/wheezy/debian-edu-config/cf/cfengine.conf
===================================================================
--- branches/wheezy/debian-edu-config/cf/cfengine.conf	2013-07-02 10:01:01 UTC (rev 81295)
+++ branches/wheezy/debian-edu-config/cf/cfengine.conf	2013-07-02 10:02:57 UTC (rev 81296)
@@ -28,7 +28,7 @@
               			editfiles
                 		copy
               	 		shellcommands
-              			files
+              			files.secondpass
               	 		shellcommands.secondpass
               	 		shellcommands.thirdpass
               	 		shellcommands.forthpass

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 10:01:01 UTC (rev 81295)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-02 10:02:57 UTC (rev 81296)
@@ -8,6 +8,8 @@
     server.
   * Teach debian-edu-pxeinstall to use short forms locale and keymap
     as boot parameters to make the parameter list shorter.
+  * Correct cfengine setup to set files.secondpass on the second files
+    pass.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 02 Jul 2013 10:10:01 +0200