diff options
author | Adam Jahn <ajjahn@gmail.com> | 2015-07-23 21:09:49 -0400 |
---|---|---|
committer | Adam Jahn <ajjahn@gmail.com> | 2015-07-23 21:09:49 -0400 |
commit | c5c82664fedd3ddd296a99af793c0274676bdfd1 (patch) | |
tree | 5f65f02c446e271f27404185db641658dd7c3534 | |
parent | f08c0c4d785773a73edfcb73f3797a9c80ed8871 (diff) | |
parent | ea83802dcbe0f3fafc37907e6e9a57179b122234 (diff) | |
download | puppet-samba-c5c82664fedd3ddd296a99af793c0274676bdfd1.tar.gz puppet-samba-c5c82664fedd3ddd296a99af793c0274676bdfd1.tar.bz2 |
Merge pull request #42 from thehyve/nmbd
Also start nmbd on ubuntu (and other systems that split out smbd and nmbd service configuration files)
-rw-r--r-- | manifests/server/params.pp | 6 | ||||
-rw-r--r-- | manifests/server/service.pp | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/manifests/server/params.pp b/manifests/server/params.pp index aa9674e..5f2fc3e 100644 --- a/manifests/server/params.pp +++ b/manifests/server/params.pp @@ -9,12 +9,14 @@ class samba::server::params { 'Debian': { case $::operatingsystem{ 'Debian': { $service_name = 'samba' } - 'Ubuntu': { $service_name = 'smbd' } + 'Ubuntu': { $service_name = 'smbd' + $nmbd_name = 'nmbd' } default: { $service_name = 'samba' } } } 'Gentoo': { $service_name = 'samba' } - 'Archlinux': { $service_name = 'smbd' } + 'Archlinux': { $service_name = 'smbd' + $nmbd_name = 'nmbd' } # Currently Gentoo has $::osfamily = "Linux". This should change in # Factor 1.7.0 <http://projects.puppetlabs.com/issues/17029>, so diff --git a/manifests/server/service.pp b/manifests/server/service.pp index a8797de..1a9fbe7 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -12,4 +12,14 @@ class samba::server::service ( enable => $enable, require => Class['samba::server::config'] } + + if $nmbd_name != undef { + service { $nmbd_name : + ensure => $ensure, + hasrestart => false, + enable => $enable, + require => Class['samba::server::config'], + } + } + } |