add puppet-lint

diff --git a/Gemfile b/Gemfile
new file mode 100644 (file)
index 0000000..0b9fdc5
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem "rake"
+gem "puppet-lint"
+gem "puppet"
\ No newline at end of file

diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644 (file)
index 0000000..6b9032d
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,18 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    facter (1.6.13)
+    hiera (1.0.0)
+    puppet (3.0.1)
+      facter (~> 1.6.11)
+      hiera (~> 1.0.0)
+    puppet-lint (0.3.2)
+    rake (0.9.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  puppet
+  puppet-lint
+  rake

diff --git a/Rakefile b/Rakefile
new file mode 100644 (file)
index 0000000..8e7269f
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,16 @@
+require 'puppet'
+require 'rake'
+require 'puppet-lint/tasks/puppet-lint'
+
+# Leave this in until we're ready to write documentation
+PuppetLint.configuration.send("disable_documentation")
+
+# Ruby's version of true does not equate to puppet's version of true
+PuppetLint.configuration.send("disable_quoted_booleans")
+PuppetLint.configuration.send("disable_selector_inside_resource")
+PuppetLint.configuration.send("disable_autoloader_layout")
+PuppetLint.configuration.send("disable_80chars")
+PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
+
+desc "Run puppet-lint"
+task :default => [:lint]

diff --git a/manifests/server.pp b/manifests/server.pp
index 66d10b1c17586c40cf432f6f7727c38c41f99473..f3253bb22ee4ff4cf619bdf94bc63cc1324870ef 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -7,53 +7,53 @@ class samba::server($interfaces = '',
   include samba::server::config
   include samba::server::service
 
-  $context = "/files/etc/samba/smb.conf"
+  $context = '/files/etc/samba/smb.conf'
   $target = "target[. = 'global']"
 
   augeas { 'global-section':
     context => $context,
     changes => "set ${target} global",
-    require => Class["samba::server::config"],
-    notify => Class['samba::server::service']
+    require => Class['samba::server::config'],
+    notify  => Class['samba::server::service']
   }
 
   augeas { 'global-interfaces':
     context => $context,
     changes => $interfaces ? {
-      default => ["set \"${target}/interfaces\" '$interfaces'", "set \"${target}/bind interfaces only\" yes"],
-      '' => ["rm \"${target}/interfaces\"", "rm \"${target}/bind interfaces only\""],
+      default => ["set \"${target}/interfaces\" '${interfaces}'", "set \"${target}/bind interfaces only\" yes"],
+      ''      => ["rm \"${target}/interfaces\"", "rm \"${target}/bind interfaces only\""],
     },
     require => Augeas['global-section'],
-    notify => Class['samba::server::service']
+    notify  => Class['samba::server::service']
   }
 
   augeas { 'global-security':
     context => $context,
     changes => $security ? {
-      default => "set \"${target}/security\" '$security'",
-      '' => "rm \"${target}/security\"",
+      default => "set \"${target}/security\" '${security}'",
+      ''      => "rm \"${target}/security\"",
     },
     require => Augeas['global-section'],
-    notify => Class['samba::server::service']
+    notify  => Class['samba::server::service']
   }
 
   augeas { 'global-server_string':
     context => $context,
     changes => $server_string ? {
-      default => "set \"${target}/server string\" '$server_string'",
-      '' => "rm \"${target}/server string\"",
+      default => "set \"${target}/server string\" '${server_string}'",
+      ''      => "rm \"${target}/server string\"",
     },
     require => Augeas['global-section'],
-    notify => Class['samba::server::service']
+    notify  => Class['samba::server::service']
   }
 
   augeas { 'global-workgroup':
     context => $context,
     changes => $workgroup ? {
-      default => "set ${target}/workgroup '$workgroup'",
-      '' => "rm ${target}/workgroup",
+      default => "set ${target}/workgroup '${workgroup}'",
+      ''      => "rm ${target}/workgroup",
     },
     require => Augeas['global-section'],
-    notify => Class['samba::server::service']
+    notify  => Class['samba::server::service']
   }
 }