Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
@@ -8,9 +8,9 @@ end
 
 gem 'metadata-json-lint'
 gem 'puppetlabs_spec_helper', '>= 1.1.1'
-gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet', '~> 2.0'
+gem 'puppet-lint', '>= 1.0', '< 3.0'
 gem 'puppet-lint-absolute_classname-check'
 gem 'puppet-lint-alias-check'
 gem 'puppet-lint-empty_string-check'
@@ -24,9 +24,13 @@ gem 'puppet-lint-undef_in_function-check'
 gem 'puppet-lint-unquoted_string-check'
 gem 'puppet-lint-variable_contains_upcase'
 
+# rspec must be v2 for ruby 1.8.7
 if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
-  # rspec must be v2 for ruby 1.8.7
+  # rake >=11 does not support ruby 1.8.7
   gem 'rspec', '~> 2.0'
-  # rake must be v10 for ruby 1.8.7
   gem 'rake', '~> 10.0'
 end
+
+if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
+  gem 'json', '~> 1.0'
+end

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2010-2015 Garrett Honeycutt <code@garretthoneycutt.com>
+Copyright (C) 2010-2016 Garrett Honeycutt <code@garretthoneycutt.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -28,7 +28,7 @@ only), 1.9.3, 2.0.0 and 2.1.0.
  * Ubuntu 12.04 LTS
  * Ubuntu 14.04 LTS
  * Ubuntu 16.04 LTS
- * Debian 8.2
+ * Debian 8
 
 EL no longer requires the `redhat-lsb` package.
 

manifests/init.pp

@@ -863,11 +863,11 @@
           }
         }
         'Debian': {
-          case $::lsbdistrelease {
-            '8.2': {
+          case $::lsbmajdistrelease {
+            '8': {
 
               if $ensure_vas == 'present' {
-                fail("Pam: vas is not supported on ${::osfamily} ${::lsbdistrelease}")
+                fail("Pam: vas is not supported on ${::osfamily} ${::lsbmajdistrelease}")
               }
               $default_pam_d_login_template = 'pam/login.debian8.erb'
               $default_pam_d_sshd_template  = 'pam/sshd.debian8.erb'
@@ -902,7 +902,7 @@
 
             }
             default: {
-              fail("Pam is only supported on Debian 8. Your operatingsystemmajrelease is identified as <${::lsbdistrelease}>.")
+              fail("Pam is only supported on Debian 8. Your lsbmajdistrelease is <${::lsbmajdistrelease}>.")
             }
           }
         }

metadata.json

@@ -1,8 +1,9 @@
 {
   "name": "ghoneycutt-pam",
-  "version": "2.24.0",
+  "version": "2.25.0",
   "author": "ghoneycutt",
   "summary": "Manage PAM",
+  "description": "Manages PAM, including specifying users and groups in access.conf, limits.conf, and limits fragments",
   "license": "Apache-2.0",
   "source": "git://github.com/ghoneycutt/puppet-module-pam.git",
   "project_page": "https://github.com/ghoneycutt/puppet-module-pam",
@@ -21,7 +22,7 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "6"
+        "8"
       ]
     },
     {
@@ -95,16 +96,8 @@
         "14.04",
         "16.04"
       ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "8.2"
-      ]
     }
-
   ],
-  "description": "Manages PAM, including specifying users and groups in access.conf, limits.conf, and limits fragments",
   "dependencies": [
     {"name":"ghoneycutt/common","version_requirement":">= 1.4.1 < 2.0.0"},
     {"name":"ghoneycutt/nsswitch","version_requirement":">= 1.3.0 < 2.0.0"},

spec/classes/init_spec.rb

@@ -162,11 +162,11 @@
             :types          => ['auth', 'account', 'password', 'session', 'noninteractive_session' ],
           }, ],
       },
-    'debian82'              =>
+    'debian8'               =>
     { :osfamily             => 'Debian',
       :lsbdistid            => 'Debian',
-      :release              => '8.2',
-      :releasetype          => 'lsbdistrelease',
+      :release              => '8',
+      :releasetype          => 'lsbmajdistrelease',
       :packages             => [ 'libpam0g', ],
       :files                => [
         { :prefix           => 'pam_common_',
@@ -190,7 +190,7 @@
       { :osfamily           => 'Debian',
         :release            => '7',
         :lsbdistid          => 'Debian',
-        :releasetype        => 'lsbdistid',
+        :releasetype        => 'lsbmajdistrelease',
       },
     'ubuntu1004'            =>
       { :osfamily           => 'Debian',
@@ -210,6 +210,7 @@
       context "with defaults params on #{k}" do
         let :facts do
           { :osfamily => v[:osfamily],
+            :lsbdistid => v[:lsbdistid],
             :"#{v[:releasetype]}" => v[:release],
           }
         end
@@ -315,7 +316,7 @@
             next
           end
 
-          if check == 'vas' and v[:osfamily] == 'Debian' and v[:release] == '8.2'
+          if check == 'vas' and v[:osfamily] == 'Debian' and v[:release] == '8'
             it 'should fail' do
               expect {
                 should contain_class('pam')