aboutsummaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-24 14:18:03 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-24 14:18:03 -0300
commit309d5859d9c801218075789fe068869ab49065f5 (patch)
treedc31d7e0e39b48f75475f374d5301bba10c7c64a /manifests/init.pp
parent846ed365f19187b50f9aff0c7911b533880398a7 (diff)
parenteb97a2b642499fde7afdb64dfd3e2b7e8c14eacc (diff)
downloadpuppet-samba-309d5859d9c801218075789fe068869ab49065f5.tar.gz
puppet-samba-309d5859d9c801218075789fe068869ab49065f5.tar.bz2
Merge branch 'master' of https://github.com/ajjahn/puppet-samba
Conflicts: manifests/server/service.pp
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp4
1 files changed, 3 insertions, 1 deletions
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
+}