File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change 2424 $target_ou = ' Nix_Mashine' ,
2525 $perform_join = true ) {
2626
27- $krb5_user_package = $::osfamily ? {
27+ require ' samba::server'
28+
29+ $krb5_user_package = $facts [' os' ][' family' ] ? {
2830 ' RedHat' => ' krb5-workstation' ,
2931 default => ' krb5-user' ,
3032 }
3133
32- if $::osfamily == ' RedHat' {
33- if $::operatingsystemrelease =~ /^6\./ {
34+ if $facts [ ' os ' ][ ' family ' ] == ' RedHat' {
35+ if $facts [ ' os ' ][ ' release ' ][ ' major ' ] == ' 6 ' {
3436 $winbind_package = ' samba-winbind'
3537 } else {
3638 $winbind_package = ' samba-common'
Original file line number Diff line number Diff line change 11# == Class samba::server::params
22#
33class samba::server::params {
4- case $::osfamily {
4+ case $facts [ ' os ' ][ ' family ' ] {
55 ' Redhat' : { $service_name = ' smb' }
66 ' Debian' : {
7- case $::operatingsystem {
7+ case $facts [ ' os ' ][ ' name ' ] {
88 ' Debian' : {
9- case $::operatingsystemmajrelease {
9+ case $facts [ ' os ' ][ ' release ' ][ ' major ' ] {
1010 ' 8' : { $service_name = ' smbd' }
1111 default: { $service_name = ' samba' }
1212 }
2323 $service_name = ' smbd'
2424 $nmbd_name = ' nmbd'
2525 }
26- default: { fail(" ${::osfamily } is not supported by this module." ) }
26+ default: { fail(" ${facts['os']['family'] } is not supported by this module." ) }
2727 }
2828}
You can’t perform that action at this time.
0 commit comments