summaryrefslogtreecommitdiff
path: root/manifests/option.pp
diff options
context:
space:
mode:
authorRaffael Schmid <raffael@yux.ch>2012-02-10 17:49:28 +0100
committerRaffael Schmid <raffael@yux.ch>2012-02-10 17:49:28 +0100
commit923f9a5d8b0a16a9a849a34c2a3a0dbba6339257 (patch)
treeb296f03b4444f10679d02fb492daef876e401c6e /manifests/option.pp
parentc6f9e4ff4ac280e4be7ddfee1d037b4a29ae787c (diff)
update module to use concat instead of concatfilepart
Diffstat (limited to 'manifests/option.pp')
-rw-r--r--manifests/option.pp17
1 files changed, 5 insertions, 12 deletions
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";
}
}