summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp13
1 files changed, 6 insertions, 7 deletions
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)
+
}
}