summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorroot <root@localhost>2012-09-21 15:03:08 +0200
committerroot <root@localhost>2012-09-21 15:03:08 +0200
commit1c5eb8a64426c93d8118acac52870a6a95f73010 (patch)
treecb8f65e5ce548053d7c3b66aa1ab5bd5f1a3ff47 /puppet/manifests/site.pp
parent75e57c74d5aa0595e02435ca4de15b9df1cc6002 (diff)
oved things around
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp18
1 files changed, 5 insertions, 13 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index abb81511..98e683af 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -2,26 +2,18 @@ define print() {
notice("The value is: '${name}'")
}
-define create_openvpn_config($port, $protocol) {
- $openvpn_configname=$name
- notice("Creating OpenVPN $openvpn_configname:
- Port: $port, Protocol: $protocol")
- # ...
- #include site_openvpn
-
-}
-
node 'default' {
- #$password=hiera('testpw')
- #notify {"Password: $password":}
+ $concat_basedir = '/var/lib/puppet/modules/concat'
+ include concat::setup
$services=hiera_array('services')
notice("Services for $fqdn: $services")
if 'eip' in $services {
- $openvpn=hiera('openvpn')
$tor=hiera('tor')
notice("Tor enabled: $tor")
- create_resources('create_openvpn_config', $openvpn)
+
+ $openvpn_config=hiera('openvpn')
+ create_resources('site_openvpn::server_config', $openvpn_config)
}
}