From 1c5eb8a64426c93d8118acac52870a6a95f73010 Mon Sep 17 00:00:00 2001
From: root <root@localhost>
Date: Fri, 21 Sep 2012 15:03:08 +0200
Subject: oved things around

---
 puppet/manifests/site.pp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'puppet/manifests/site.pp')

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)
   }
 }
-- 
cgit v1.2.3