From 923f9a5d8b0a16a9a849a34c2a3a0dbba6339257 Mon Sep 17 00:00:00 2001 From: Raffael Schmid Date: Fri, 10 Feb 2012 17:49:28 +0100 Subject: update module to use concat instead of concatfilepart --- manifests/option.pp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'manifests/option.pp') diff --git a/manifests/option.pp b/manifests/option.pp index 8c2a7a2..5cadb31 100644 --- a/manifests/option.pp +++ b/manifests/option.pp @@ -1,6 +1,6 @@ # option.pp -define openvpn::option($ensure = present, $key, $value = "", $server, $client = "", $csc = false) { +define openvpn::option($key, $value = "", $server, $client = "", $csc = false) { $content = $value ? { "" => "${key}", default => "${key} ${value}" @@ -8,24 +8,17 @@ define openvpn::option($ensure = present, $key, $value = "", $server, $client = if $client == "" { $path = "/etc/openvpn/${server}.conf" - $req = File["/etc/openvpn"] - $notify = Service["openvpn"] } else { if $csc { $path = "/etc/openvpn/${server}/client-configs/${client}" } else { $path = "/etc/openvpn/${server}/download-configs/${client}/${client}.conf" } - $req = [ File["/etc/openvpn"], File["/etc/openvpn/${server}/download-configs/${client}"] ] - $notify = undef } - common::concatfilepart { - "${name}": - ensure => $ensure, - file => $path, - content => "${content}\n", - notify => $notify, - require => $req; + concat::fragment { + "openvpn.${server}.${client}.${name}": + target => $path, + content => "${content}\n"; } } -- cgit v1.2.3