PAM and initramfs config for wheezy

diff --git a/manifests/subsystems/initramfs.pp b/manifests/subsystems/initramfs.pp
index 0a8d49bff33dce3e07b69dc394f69cebea42569b..58e5c712e9ba53944eaa720d52e72ec78537d5e2 100644 (file)
--- a/manifests/subsystems/initramfs.pp
+++ b/manifests/subsystems/initramfs.pp
@@ -1,4 +1,6 @@
-class initramfs {
+class initramfs(
+  $keymap = hiera('nodo::initramfs::keymap', 'absent')
+) {
   # initramfs config
   file { "/etc/kernel-img.conf":
     owner   => "root",
@@ -17,9 +19,30 @@ class initramfs {
     source  => "puppet:///modules/nodo/etc/initramfs-tools/modules",
   }
 
+  # keymap
+  file { "/etc/initramfs-tools/conf.d/keymap.conf":
+    ensure  => $keymap,
+    content => "KEYMAP=Y\n",
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+  }
+
+  # keyboard
+  # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619711
+  file { "/etc/default/keyboard":
+    ensure => present,
+    owner  => "root",
+    group  => "root",
+    mode   => 0644,
+  }
+
   # update initramfs when needed
   exec { "update-initramfs -v -t -u":
-    subscribe   => [ File["/etc/initramfs-tools/modules"], File["/etc/modprobe.d/blacklist"] ],
+    subscribe   => [ File["/etc/initramfs-tools/modules"],
+                     File["/etc/modprobe.d/blacklist"],
+                     File["/etc/initramfs-tools/conf.d/keymap.conf"],
+                     File["/etc/default/keyboard"] ],
     refreshonly => true,
     alias       => 'update-initramfs',
   }

diff --git a/manifests/subsystems/pam.pp b/manifests/subsystems/pam.pp
index 62b9e22b018c5368f29a8020ef963b4fb9799f4f..dc326a1813f80b5e2e20927be4a648d078653624 100644 (file)
--- a/manifests/subsystems/pam.pp
+++ b/manifests/subsystems/pam.pp
@@ -2,24 +2,27 @@ class pam(
   $enable = hiera('nodo::pam::enable', false)
 ) {
   if $enable != false {
-    # pam - login
-    file { "/etc/pam.d/login":
-      source  => [ "puppet:///modules/nodo/etc/pam.d/login.${::lsbdistcodename}",
-                   "puppet:///modules/nodo/etc/pam.d/login",
-                 ],
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
-      ensure  => present,
-    }
+    # Squeeze only
+    if $::lsbdistcodename == 'squeeze' {
+      # pam - login
+      file { "/etc/pam.d/login":
+        source  => [ "puppet:///modules/nodo/etc/pam.d/login.${::lsbdistcodename}",
+                     "puppet:///modules/nodo/etc/pam.d/login",
+                   ],
+        owner   => "root",
+        group   => "root",
+        mode    => 0644,
+        ensure  => present,
+      }
 
-    # pam - gdm
-    file { "/etc/pam.d/gdm":
-      source  => "puppet:///modules/nodo/etc/pam.d/gdm",
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
-      ensure  => present,
+      # pam - gdm
+      file { "/etc/pam.d/gdm":
+        source  => "puppet:///modules/nodo/etc/pam.d/gdm",
+        owner   => "root",
+        group   => "root",
+        mode    => 0644,
+        ensure  => present,
+      }
     }
 
     # pam - mountpoints