Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Add Ubuntu to the Debian family of supported OSs and fix some broken variable references #3

Open
akesterson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Ubuntu to the Debian family of supported OSs and fix some broken variable references #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions manifests/pamd.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,7 @@
}

case $::operatingsystem {

/(?i:Debian)/: {
/(?i:Debian|Ubuntu)/: {
include pam::pamd::debian
}

Expand Down
3 changes: 1 addition & 2 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
class pam::params {

case $::operatingsystem {

/(?i:Debian)/: {
/(?i:Debian|Ubuntu)/: {
$packages = [ 'libpam-ldap' ]
$prefix_pamd = '/etc/pam.d'
$owner = 'root'
Expand Down
4 changes: 2 additions & 2 deletions templates/pam.d/common-session-noninteractive.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
###############################################################################

<% if scope.lookupvar('pam::pamd::pam_mkhomedir') == true then -%>
session <%= scope.lookupvar('pam::pamd::pam_mkhomedir_session_set') %>
session <%= scope.lookupvar('pam::params::pam_mkhomedir_session') %>
<% end -%>

session [default=1] pam_permit.so
session requisite pam_deny.so
session required pam_permit.so
session required pam_unix.so
<% if scope.lookupvar('pam::pamd::pam_ldap') == true then -%>
session <%= scope.lookupvar('pam::pamd::pam_ldap_session_set') %>
session <%= scope.lookupvar('pam::params::pam_ldap_session') %>
<% end -%>
4 changes: 2 additions & 2 deletions templates/pam.d/common-session.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
###############################################################################

<% if scope.lookupvar('pam::pamd::pam_mkhomedir') == true then -%>
session <%= scope.lookupvar('pam::pamd::pam_mkhomedir_session_set') %>
session <%= scope.lookupvar('pam::params::pam_mkhomedir_session') %>
<% end -%>

session [default=1] pam_permit.so
Expand All @@ -13,5 +13,5 @@ session required pam_permit.so
session required pam_unix.so
<% if scope.lookupvar('pam::pamd::pam_ldap') == true then -%>
#session optional pam_ldap.so
session <%= scope.lookupvar('pam::pamd::pam_ldap_session_set') %>
session <%= scope.lookupvar('pam::params::pam_ldap_session') %>
<% end -%>