summaryrefslogtreecommitdiff
path: root/manifests/init.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/init.pp
parentc6f9e4ff4ac280e4be7ddfee1d037b4a29ae787c (diff)
update module to use concat instead of concatfilepart
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp24
1 files changed, 18 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 55dac85..7e7fe32 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -10,7 +10,7 @@ class openvpn {
ensure => running,
hasrestart => true,
hasstatus => true,
- require => Exec["/etc/default/openvpn concatenation"];
+ require => Exec["concat_/etc/default/openvpn"];
}
file {
"/etc/openvpn":
@@ -22,11 +22,23 @@ class openvpn {
ensure => directory,
require => File["/etc/openvpn"];
}
- common::concatfilepart {
- "00-etc-default-openvpn header":
- ensure => present,
+
+ include concat::setup
+
+ concat {
+ "/etc/default/openvpn":
+ owner => root,
+ group => root,
+ mode => 644,
+ warn => true,
+ notify => Service["openvpn"];
+ }
+
+ concat::fragment {
+ "openvpn.default.header":
content => template("openvpn/etc-default-openvpn.erb"),
- notify => Service["openvpn"],
- file => "/etc/default/openvpn";
+ target => "/etc/default/openvpn",
+ order => 01;
}
+
}