From 1ca68124d544ec6e222263400775f127e8111f46 Mon Sep 17 00:00:00 2001 From: "sauce@freenode" Date: Tue, 2 Dec 2014 15:57:30 -0500 Subject: Remove "Check winbind service" from log output I really like to keep log output very clean.. This seems unnecessary and it's sticking out like a sore thumb when doing "puppet agent -t" --- manifests/server/winbind.pp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'manifests/server/winbind.pp') diff --git a/manifests/server/winbind.pp b/manifests/server/winbind.pp index 76136b9..b3fe1a9 100644 --- a/manifests/server/winbind.pp +++ b/manifests/server/winbind.pp @@ -1,10 +1,6 @@ class samba::server::winbind ($ensure = running, $enable = true) { $service_name = 'winbind' - notify { 'winbind-service': - message => 'Check winbind service', - } - service { $service_name: ensure => $ensure, hasstatus => true, -- cgit v1.2.3 From e47f9cba618d9b1891836b3d9dfa6d7e09f40e49 Mon Sep 17 00:00:00 2001 From: Adam Jahn Date: Mon, 13 Apr 2015 15:14:00 -0400 Subject: document classes to satisfy linting --- manifests/init.pp | 4 +++- manifests/server.pp | 2 ++ manifests/server/ads.pp | 4 +--- manifests/server/config.pp | 2 ++ manifests/server/install.pp | 4 +++- manifests/server/option.pp | 2 ++ manifests/server/service.pp | 2 ++ manifests/server/share.pp | 2 ++ manifests/server/user.pp | 4 +++- manifests/server/winbind.pp | 2 ++ 10 files changed, 22 insertions(+), 6 deletions(-) (limited to 'manifests/server/winbind.pp') diff --git a/manifests/init.pp b/manifests/init.pp index 8a914a4..4fbac9a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,7 +1,9 @@ +# == Class samba +# class samba { include samba::server if samba::server::security == 'ads' { include samba::server::ads } -} \ No newline at end of file +} diff --git a/manifests/server.pp b/manifests/server.pp index 65ea660..d4af927 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -1,3 +1,5 @@ +# == Class samba::server +# class samba::server($interfaces = '', $security = '', $server_string = '', diff --git a/manifests/server/ads.pp b/manifests/server/ads.pp index 781a6a9..1260fd1 100644 --- a/manifests/server/ads.pp +++ b/manifests/server/ads.pp @@ -1,8 +1,6 @@ +# == Class samba::server::ads # This module join samba server to Active Dirctory # -# Copyright (c) 2013 Lebedev Vadim, abraham1901 at g mail dot c o m -# Licensed under the MIT License, http://opensource.org/licenses/MIT - class samba::server::ads($ensure = present, $winbind_acct = 'admin', $winbind_pass = 'SecretPass', diff --git a/manifests/server/config.pp b/manifests/server/config.pp index d51e432..1ecb490 100644 --- a/manifests/server/config.pp +++ b/manifests/server/config.pp @@ -1,3 +1,5 @@ +# == Class samba::server::config +# class samba::server::config { file { '/etc/samba': diff --git a/manifests/server/install.pp b/manifests/server/install.pp index 1454bfe..ec98a49 100644 --- a/manifests/server/install.pp +++ b/manifests/server/install.pp @@ -1,5 +1,7 @@ +# == Class samba::server::install +# class samba::server::install { package { 'samba': ensure => installed } -} \ No newline at end of file +} diff --git a/manifests/server/option.pp b/manifests/server/option.pp index 0b34edb..bf491e8 100644 --- a/manifests/server/option.pp +++ b/manifests/server/option.pp @@ -1,3 +1,5 @@ +# == Define samba::server::option +# define samba::server::option ( $value = '' ) { $incl = $samba::server::incl $context = $samba::server::context diff --git a/manifests/server/service.pp b/manifests/server/service.pp index fdd9104..2226497 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -25,6 +25,8 @@ class samba::server::service ($ensure = running, $enable = true) { } default: { fail("${::osfamily} is not supported by this module.") } } +# == Class samba::server::server +# service { $service_name : ensure => $ensure, diff --git a/manifests/server/share.pp b/manifests/server/share.pp index eacd5b7..d86e8c5 100644 --- a/manifests/server/share.pp +++ b/manifests/server/share.pp @@ -1,3 +1,5 @@ +# == Define samba::server::share +# define samba::server::share($ensure = present, $available = '', $browsable = '', diff --git a/manifests/server/user.pp b/manifests/server/user.pp index e3d84cc..b8f2e61 100644 --- a/manifests/server/user.pp +++ b/manifests/server/user.pp @@ -1,4 +1,6 @@ -define samba::server::user( +# == Class samba::server::user +# +define samba::server::user ( $password, $user_name = $name, ) { diff --git a/manifests/server/winbind.pp b/manifests/server/winbind.pp index 76136b9..68128e5 100644 --- a/manifests/server/winbind.pp +++ b/manifests/server/winbind.pp @@ -1,3 +1,5 @@ +# == Class samba::server::winbind +# class samba::server::winbind ($ensure = running, $enable = true) { $service_name = 'winbind' -- cgit v1.2.3 From 41660aec9c7e8a43f029b31d6f1ef9374487dac9 Mon Sep 17 00:00:00 2001 From: Adam Jahn Date: Mon, 7 Dec 2015 18:32:33 -0500 Subject: lint! --- Rakefile | 2 +- manifests/server/ads.pp | 6 ++-- manifests/server/config.pp | 10 +++--- manifests/server/params.pp | 12 ++++--- manifests/server/service.pp | 17 +++++---- manifests/server/share.pp | 84 ++++++++++++++++----------------------------- manifests/server/winbind.pp | 11 +++--- 7 files changed, 58 insertions(+), 84 deletions(-) (limited to 'manifests/server/winbind.pp') diff --git a/Rakefile b/Rakefile index 908647f..92f4578 100644 --- a/Rakefile +++ b/Rakefile @@ -37,6 +37,6 @@ end desc "Run syntax, lint, and spec tests." task :test => [ :syntax, -# :lint, + :lint, :spec, ] diff --git a/manifests/server/ads.pp b/manifests/server/ads.pp index 1260fd1..7b496fe 100644 --- a/manifests/server/ads.pp +++ b/manifests/server/ads.pp @@ -23,13 +23,13 @@ class samba::server::ads($ensure = present, $map_readonly = 'no', $target_ou = 'Nix_Mashine') { - $krb5_user_package = $osfamily ? { + $krb5_user_package = $::osfamily ? { 'RedHat' => 'krb5-workstation', default => 'krb5-user', } - if $osfamily == 'RedHat' { - if $operatingsystemrelease =~ /^6\./ { + if $::osfamily == 'RedHat' { + if $::operatingsystemrelease =~ /^6\./ { $winbind_package = 'samba-winbind' } else { $winbind_package = 'samba-common' diff --git a/manifests/server/config.pp b/manifests/server/config.pp index 1ecb490..eb9b78e 100644 --- a/manifests/server/config.pp +++ b/manifests/server/config.pp @@ -1,12 +1,11 @@ # == Class samba::server::config # class samba::server::config { - file { '/etc/samba': - ensure => directory, - owner => 'root', - group => 'root', - mode => '0755', + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', } file { '/etc/samba/smb.conf': @@ -17,5 +16,4 @@ class samba::server::config { require => [File['/etc/samba'], Class['samba::server::install']], notify => Class['samba::server::service'] } - } diff --git a/manifests/server/params.pp b/manifests/server/params.pp index ba0c1be..be9e01b 100644 --- a/manifests/server/params.pp +++ b/manifests/server/params.pp @@ -11,14 +11,18 @@ class samba::server::params { default: { $service_name = 'samba' } } } - 'Ubuntu': { $service_name = 'smbd' - $nmbd_name = 'nmbd' } + 'Ubuntu': { + $service_name = 'smbd' + $nmbd_name = 'nmbd' + } default: { $service_name = 'samba' } } } 'Gentoo': { $service_name = 'samba' } - 'Archlinux': { $service_name = 'smbd' - $nmbd_name = 'nmbd' } + 'Archlinux': { + $service_name = 'smbd' + $nmbd_name = 'nmbd' + } # Currently Gentoo has $::osfamily = "Linux". This should change in # Factor 1.7.0 , so diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 1a9fbe7..68db2d6 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -5,21 +5,20 @@ class samba::server::service ( $enable = true ) inherits samba::server::params { - service { $service_name : - ensure => $ensure, - hasstatus => true, - hasrestart => true, - enable => $enable, - require => Class['samba::server::config'] + service { $samba::server::params::service_name : + ensure => $ensure, + hasstatus => true, + hasrestart => true, + enable => $enable, + require => Class['samba::server::config'] } - if $nmbd_name != undef { - service { $nmbd_name : + if $samba::server::params::nmbd_name != undef { + service { $samba::server::params::nmbd_name : ensure => $ensure, hasrestart => false, enable => $enable, require => Class['samba::server::config'], } } - } diff --git a/manifests/server/share.pp b/manifests/server/share.pp index 5a6667c..c682055 100644 --- a/manifests/server/share.pp +++ b/manifests/server/share.pp @@ -36,14 +36,16 @@ define samba::server::share($ensure = present, $context = $samba::server::context $target = "target[. = '${name}']" + $section_changes = $ensure ? { + present => "set ${target} '${name}'", + default => "rm ${target} '${name}'", + } + augeas { "${name}-section": incl => $incl, lens => 'Samba.lns', context => $context, - changes => $ensure ? { - present => "set ${target} '${name}'", - default => "rm ${target} '${name}'", - }, + changes => $section_changes, require => Class['samba::server::config'], notify => Class['samba::server::service'] } @@ -51,22 +53,22 @@ define samba::server::share($ensure = present, if $ensure == 'present' { $changes = [ $available ? { - true => "set \"${target}/available\" yes", - false => "set \"${target}/available\" no", - default => "rm \"${target}/available\"", - }, + true => "set \"${target}/available\" yes", + false => "set \"${target}/available\" no", + default => "rm \"${target}/available\"", + }, $browsable ? { - true => "set \"${target}/browsable\" yes", - false => "set \"${target}/browsable\" no", - default => "rm \"${target}/browsable\"", + true => "set \"${target}/browsable\" yes", + false => "set \"${target}/browsable\" no", + default => "rm \"${target}/browsable\"", }, $comment ? { - default => "set \"${target}/comment\" '${comment}'", - '' => "rm \"${target}/comment\"", + default => "set \"${target}/comment\" '${comment}'", + '' => "rm \"${target}/comment\"", }, $copy ? { - '' => "rm \"${target}/copy\"", - default => "set \"${target}/copy\" '${copy}'", + '' => "rm \"${target}/copy\"", + default => "set \"${target}/copy\" '${copy}'", }, $create_mask ? { '' => "rm \"${target}/create mask\"", @@ -160,63 +162,35 @@ define samba::server::share($ensure = present, false => "set \"${target}/strict allocate\" no", default => "rm \"${target}/strict allocate\"", }, - ] - - augeas { "${name}-changes": - incl => $incl, - lens => 'Samba.lns', - context => $context, - changes => $changes, - require => Augeas["${name}-section"], - notify => Class['samba::server::service'] - } - - augeas { "${name}-valid_users": - context => $context, - changes => $valid_users ? { + $valid_users ? { '' => "rm \"${target}/valid users\"", default => "set \"${target}/valid users\" '${valid_users}'", }, - require => Augeas["${name}-section"], - notify => Class['samba::server::service'] - } - - augeas { "${name}-op_locks": - context => $context, - changes => $op_locks ? { + $op_locks ? { '' => "rm \"${target}/oplocks\"", default => "set \"${target}/oplocks\" '${op_locks}'", }, - require => Augeas["${name}-section"], - notify => Class['samba::server::service'] - } - augeas { "${name}-level2_oplocks": - context => $context, - changes => $level2_oplocks ? { + $level2_oplocks ? { '' => "rm \"${target}/level2 oplocks\"", default => "set \"${target}/level2 oplocks\" '${level2_oplocks}'", }, - require => Augeas["${name}-section"], - notify => Class['samba::server::service'] - } - augeas { "${name}-veto_oplock_files": - context => $context, - changes => $veto_oplock_files ? { + $veto_oplock_files ? { '' => "rm \"${target}/veto oplock files\"", default => "set \"${target}/veto oplock files\" '${veto_oplock_files}'", }, - require => Augeas["${name}-section"], - notify => Class['samba::server::service'] - } - augeas { "${name}-write_list": - context => $context, - changes => $write_list ? { + $write_list ? { '' => "rm \"${target}/write list\"", default => "set \"${target}/write list\" '${write_list}'", }, + ] + + augeas { "${name}-changes": + incl => $incl, + lens => 'Samba.lns', + context => $context, + changes => $changes, require => Augeas["${name}-section"], notify => Class['samba::server::service'] } - } } diff --git a/manifests/server/winbind.pp b/manifests/server/winbind.pp index 376fed6..a379bb7 100644 --- a/manifests/server/winbind.pp +++ b/manifests/server/winbind.pp @@ -4,11 +4,10 @@ class samba::server::winbind ($ensure = running, $enable = true) { $service_name = 'winbind' service { $service_name: - ensure => $ensure, - hasstatus => true, - hasrestart => true, - enable => $enable, - require => Class['samba::server::config'] + ensure => $ensure, + hasstatus => true, + hasrestart => true, + enable => $enable, + require => Class['samba::server::config'] } - } -- cgit v1.2.3