From e5244f7015de9ffd88c20e9b8136996bfbfe0f0d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 16:08:07 +0200
Subject: added site_config::eip

---
 puppet/manifests/site.pp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 5f58a733..3ae9ebea 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -4,7 +4,7 @@ node 'default' {
   # $concat_basedir =  '/var/lib/puppet/modules/concat'  # do we need this ?
   include concat::setup
   include apt, lsb, git
-  import "common"
+  import 'common'
 
   $services=hiera_array('services')
   notice("Services for $fqdn: $services")
@@ -18,13 +18,7 @@ node 'default' {
 
 
   if 'eip' in $services {
-    include site_openvpn
-
-    $tor=hiera('tor')
-    notice("Tor enabled: $tor")
-
-    $openvpn_configs=hiera('openvpn_server_configs')
-    create_resources('site_openvpn::server_config', $openvpn_configs)
+    include site_config::eip
   }
 
 }
-- 
cgit v1.2.3