From da84d4e24d3eefda7e010e58203913e74108a699 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Tue, 21 Jan 2014 17:29:50 +0200
Subject: [PATCH] pam: Added pam::mkhomedir $umask parameter support for
 Ubuntu.

---
 pam/manifests/init.pp                                    | 6 +++---
 pam/{files/pam_mkhomedir => templates/pam_mkhomedir.erb} | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pam/{files/pam_mkhomedir => templates/pam_mkhomedir.erb} (52%)

diff --git a/pam/manifests/init.pp b/pam/manifests/init.pp
index 9a7765f..3c607ef 100644
--- a/pam/manifests/init.pp
+++ b/pam/manifests/init.pp
@@ -10,7 +10,7 @@ class pam::common {
             }
         }
         "ubuntu": {
-            package { "libpam-runtime":
+            package { [ "libpam-runtime", "libpam-modules", ]:
                 ensure => installed,
             }
             exec { "pam-auth-update":
@@ -54,11 +54,11 @@ class pam::mkhomedir ($umask=0077) {
     }
     "ubuntu": {
       file { "/usr/share/pam-configs/pam_mkhomedir":
-        source  => "puppet:///modules/pam/pam_mkhomedir",
+        content => template("pam/pam_mkhomedir.erb"),
         mode    => "0644",
         owner   => "root",
         group   => "root",
-        require => Package["libpam-runtime"],
+        require => [ Package["libpam-runtime"], Package["libpam-modules"], ],
         notify  => Exec["pam-auth-update"],
       }
     }
diff --git a/pam/files/pam_mkhomedir b/pam/templates/pam_mkhomedir.erb
similarity index 52%
rename from pam/files/pam_mkhomedir
rename to pam/templates/pam_mkhomedir.erb
index d8f531f..0014b28 100644
--- a/pam/files/pam_mkhomedir
+++ b/pam/templates/pam_mkhomedir.erb
@@ -3,4 +3,4 @@ Default: yes
 Priority: 900
 Session-Type: Additional
 Session:
-        required                        pam_mkhomedir.so
+        required                        pam_mkhomedir.so umask=<%= @umask %>