Merge branch 'master' of https://github.com/ajjahn/puppet-samba

Conflicts:
	manifests/server.pp

1 files changed, 15 insertions, 7 deletions

diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index e9b1ed9..9699857 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -1,11 +1,19 @@
 class samba::server::config {
-  
+
+  file { "/etc/samba":
+    ensure => directory,
+    owner => "root",
+    group => "root",
+    mode => 0755,
+  }
+
   file { "/etc/samba/smb.conf":
-    ensure => $ensure,
-    owner => root,
-    group => root,
-    require => Class["samba::server::install"],
+    ensure => present,
+    owner => "root",
+    group => "root",
+    mode => 0644,
+    require => [File["/etc/samba"], Class["samba::server::install"]],
     notify => Class["samba::server::service"]
   }
-  
-}
\ No newline at end of file
+
+}