From 20824e09d404db28188d150034fb4c4b5620dba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Mon, 2 Sep 2013 16:21:57 +0300 Subject: [PATCH] samba: Added datadir support for netlogon directory in samba::server::pdc --- samba/manifests/init.pp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/samba/manifests/init.pp b/samba/manifests/init.pp index af74033..845dac9 100644 --- a/samba/manifests/init.pp +++ b/samba/manifests/init.pp @@ -221,9 +221,27 @@ class samba::server::wins inherits samba::server::configs { # Add Primary Domain Controller role to Samba server # -class samba::server::pdc inherits samba::server::configs { +class samba::server::pdc($datadir="/srv/netlogon") inherits samba::server::configs { - file { "/srv/netlogon": + if $datadir != "/srv/netlogon" { + file { "/srv/netlogon": + ensure => link, + target => $datadir, + owner => "root", + group => $::operatingsystem ? { + "openbsd" => "wheel", + default => "root", + }, + seltype => "samba_share_t", + before => Service["smb"], + } + selinux::manage_fcontext { "/srv/netlogon(/.*)?": + type => "samba_share_t", + before => File["/srv/netlogon"], + } + } + + file { $datadir: ensure => directory, mode => "0755", owner => "root", @@ -234,9 +252,9 @@ class samba::server::pdc inherits samba::server::configs { seltype => "samba_share_t", before => Service["smb"], } - selinux::manage_fcontext { "/srv/netlogon(/.*)?": + selinux::manage_fcontext { "${datadir}(/.*)?": type => "samba_share_t", - before => File["/srv/netlogon"], + before => File[$datadir], } samba::server::share { "netlogon":