summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-04 16:08:07 +0200
committervarac <varacanero@zeromail.org>2012-10-04 16:08:07 +0200
commite5244f7015de9ffd88c20e9b8136996bfbfe0f0d (patch)
tree89982b950588e8f71bd980c77a7867dc8fce59c2 /puppet/manifests/site.pp
parent90766af54346987f4df54d1a65792581c7183ddd (diff)
added site_config::eip
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp10
1 files changed, 2 insertions, 8 deletions
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
}
}