From 276de1e249b25e5e00c49229132215681aee6467 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 21 Sep 2012 20:26:20 +0200
Subject: basic configuration for openvpn server files

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

(limited to 'puppet/manifests')

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 98e683af..f7b7303f 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,19 +1,18 @@
-define print() {
-  notice("The value is: '${name}'")
-}
-
 node 'default' {
-  $concat_basedir =  '/var/lib/puppet/modules/concat'
+  # $concat_basedir =  '/var/lib/puppet/modules/concat'  # do we need this ?
   include concat::setup
 
   $services=hiera_array('services')
   notice("Services for $fqdn: $services")
 
   if 'eip' in $services {
+    include site_openvpn
+
     $tor=hiera('tor')
     notice("Tor enabled: $tor")
 
-    $openvpn_config=hiera('openvpn')
-    create_resources('site_openvpn::server_config', $openvpn_config)
+    $openvpn_configs=hiera('openvpn_server_configs')
+    create_resources('site_openvpn::server_config', $openvpn_configs)
+
   }
 }
-- 
cgit v1.2.3