summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp28
1 files changed, 8 insertions, 20 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 3b28be2f..ef5c3a8a 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,30 +1,18 @@
node 'default' {
+ # prerequisites
+ import 'common'
+ include concat::setup
# include some basic classes
- # $concat_basedir = '/var/lib/puppet/modules/concat' # do we need this ?
- include concat::setup
- include apt, lsb, git
- import "common"
+ #include site_config
+ # parse services for host
$services=hiera_array('services')
notice("Services for $fqdn: $services")
- # configure ssh and inculde ssh-keys
- #include sshd
- $ssh_keys=hiera_hash('ssh_keys')
- include site_sshd
- notice($ssh_keys)
- create_resources('site_sshd::ssh_key', $ssh_keys)
-
-
- 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)
+ # configure eip
+ if 'openvpn' in $services {
+ include site_config::eip
}
if 'couchdb' in $services {