[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.8-9-g52dded8

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit b9eb38cad43c2319b38c03b11c5c4a4e5a0753d8
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Mar 23 17:44:25 2013 +0100

    System wide default umask set by PAM from '/etc/login.defs'.
    
    Enable pam_umask and set default umask to 027.  Make sure
    '/etc/munin/munin-conf.d/nodes.conf' exists and is readable by munin.

diff --git a/fai/config/scripts/CLIENT_A/50-umask b/fai/config/scripts/CLIENT_A/50-umask
new file mode 100755
index 0000000..9d930d3
--- /dev/null
+++ b/fai/config/scripts/CLIENT_A/50-umask
@@ -0,0 +1,20 @@
+#!/usr/sbin/cfagent -f
+
+control:
+   any::
+   actionsequence = ( editfiles )
+   EditFileSize = ( 30000 )
+
+editfiles:
+   any::
+	{ ${target}/etc/pam.d/common-session
+	  ## Set default umask:
+	  AppendIfNoSuchLine "session  optional  pam_umask.so"
+	}
+	{ ${target}/etc/login.defs
+	  ## Modify default umask for more privacy:
+	  BeginGroupIfNoSuchLine "UMASK           027"
+	    ReplaceAll "^UMASK.*" With "UMASK           027"
+	  EndGroup
+
+	}
diff --git a/fai/config/scripts/LOG_SERVER/20-munin.conf b/fai/config/scripts/LOG_SERVER/20-munin.conf
index a7b04b1..c00f649 100755
--- a/fai/config/scripts/LOG_SERVER/20-munin.conf
+++ b/fai/config/scripts/LOG_SERVER/20-munin.conf
@@ -2,7 +2,7 @@
 
 control:
    any::
-   actionsequence = ( editfiles )
+   actionsequence = ( editfiles files )
    EditFileSize = ( 30000 )
 
 editfiles:
@@ -10,3 +10,7 @@ editfiles:
       { ${target}/etc/munin/munin.conf
 	  ReplaceAll "\[localhost\.localdomain\]" With "[mainserver.intern]"
       }
+
+files:
+   any::
+	${target}/etc/munin/munin-conf.d/nodes.conf mode=0644 action=create
diff --git a/fai/config/scripts/SERVER_A/80-umask b/fai/config/scripts/SERVER_A/80-umask
new file mode 100755
index 0000000..9d930d3
--- /dev/null
+++ b/fai/config/scripts/SERVER_A/80-umask
@@ -0,0 +1,20 @@
+#!/usr/sbin/cfagent -f
+
+control:
+   any::
+   actionsequence = ( editfiles )
+   EditFileSize = ( 30000 )
+
+editfiles:
+   any::
+	{ ${target}/etc/pam.d/common-session
+	  ## Set default umask:
+	  AppendIfNoSuchLine "session  optional  pam_umask.so"
+	}
+	{ ${target}/etc/login.defs
+	  ## Modify default umask for more privacy:
+	  BeginGroupIfNoSuchLine "UMASK           027"
+	    ReplaceAll "^UMASK.*" With "UMASK           027"
+	  EndGroup
+
+	}

-- 
Debian-LAN development and packaging