.travis.yml

@@ -13,7 +13,6 @@ matrix:
   allow_failures:
   - rvm: 1.9.3
   - rvm: 2.0.0
-  - env: PUPPET_VERSION=3.4.2
 language: ruby
 before_script: "gem install --no-ri --no-rdoc bundler"
 script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'

Modulefile

@@ -1,5 +1,5 @@
 name    'ghoneycutt-pam'
-version '2.4.1'
+version '2.4.2'
 source 'git://github.com/ghoneycutt/puppet-module-pam.git'
 author 'ghoneycutt'
 license 'Apache License, Version 2.0'

README.md

@@ -42,7 +42,7 @@ Hash of fragments to pass to pam::limits::fragments
 
 package_name
 ------------
-Array of packages providing the pam functionality. If undef, parameter is set based on the OS version.
+String or Array of packages providing the pam functionality. If undef, parameter is set based on the OS version.
 
 - *Default*: undef, default is set based on OS version
 

manifests/accesslogin.pp

@@ -21,6 +21,6 @@
     owner   => $access_conf_owner,
     group   => $access_conf_group,
     mode    => $access_conf_mode,
-    require => Package['pam_package'],
+    require => Package[$pam::my_package_name],
   }
 }

manifests/init.pp

@@ -489,9 +489,8 @@
       include pam::accesslogin
       include pam::limits
 
-      package { 'pam_package':
+      package { $my_package_name:
         ensure => installed,
-        name   => $my_package_name,
       }
 
       file { 'pam_d_login':
@@ -522,7 +521,7 @@
             owner   => 'root',
             group   => 'root',
             mode    => '0644',
-            require => Package['pam_package'],
+            require => Package[$my_package_name],
           }
 
           file { 'pam_system_auth':
@@ -531,7 +530,7 @@
             target  => $system_auth_ac_file,
             owner   => 'root',
             group   => 'root',
-            require => Package['pam_package'],
+            require => Package[$my_package_name],
           }
 
         }
@@ -544,7 +543,7 @@
             owner   => 'root',
             group   => 'root',
             mode    => '0644',
-            require => Package['pam_package'],
+            require => Package[$my_package_name],
           }
 
           file { 'pam_common_account':
@@ -554,7 +553,7 @@
             owner   => 'root',
             group   => 'root',
             mode    => '0644',
-            require => Package['pam_package'],
+            require => Package[$my_package_name],
           }
 
           file { 'pam_common_password':
@@ -564,7 +563,7 @@
             owner   => 'root',
             group   => 'root',
             mode    => '0644',
-            require => Package['pam_package'],
+            require => Package[$my_package_name],
           }
 
           file { 'pam_common_noninteractive_session':
@@ -574,7 +573,7 @@
             owner   => 'root',
             group   => 'root',
             mode    => '0644',
-            require => Package['pam_package'],
+            require => Package[$my_package_name],
           }
 
           file { 'pam_common_session':
@@ -584,7 +583,7 @@
             owner   => 'root',
             group   => 'root',
             mode    => '0644',
-            require => Package['pam_package'],
+            require => Package[$my_package_name],
           }
         }
         'Suse': {
@@ -609,7 +608,7 @@
                 owner   => 'root',
                 group   => 'root',
                 mode    => '0644',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_account':
@@ -619,7 +618,7 @@
                 owner   => 'root',
                 group   => 'root',
                 mode    => '0644',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_password':
@@ -629,7 +628,7 @@
                 owner   => 'root',
                 group   => 'root',
                 mode    => '0644',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_session':
@@ -639,7 +638,7 @@
                 owner   => 'root',
                 group   => 'root',
                 mode    => '0644',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
             }
             '11': {
@@ -651,7 +650,7 @@
                 owner   => 'root',
                 group   => 'root',
                 mode    => '0644',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_account_pc':
@@ -661,7 +660,7 @@
                 owner   => 'root',
                 group   => 'root',
                 mode    => '0644',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_password_pc':
@@ -671,7 +670,7 @@
                 owner   => 'root',
                 group   => 'root',
                 mode    => '0644',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_session_pc':
@@ -681,7 +680,7 @@
                 owner   => 'root',
                 group   => 'root',
                 mode    => '0644',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_session':
@@ -690,7 +689,7 @@
                 target  => $common_session_pc_file,
                 owner   => 'root',
                 group   => 'root',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_password':
@@ -699,7 +698,7 @@
                 target  => $common_password_pc_file,
                 owner   => 'root',
                 group   => 'root',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_account':
@@ -708,7 +707,7 @@
                 target  => $common_account_pc_file,
                 owner   => 'root',
                 group   => 'root',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
 
               file { 'pam_common_auth':
@@ -717,7 +716,7 @@
                 target  => $common_auth_pc_file,
                 owner   => 'root',
                 group   => 'root',
-                require => Package['pam_package'],
+                require => Package[$my_package_name],
               }
             }
             default : {

manifests/limits.pp

@@ -16,6 +16,6 @@
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    require => Package['pam_package'],
+    require => Package[$pam::my_package_name],
   }
 }