summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-01-31 04:32:13 -0800
committerelijah <elijah@riseup.net>2013-01-31 04:32:13 -0800
commitefed0453a754ca1c1725192546c10ccc4fb3ebe1 (patch)
tree6b2b568fd39f72d814ddee1a115e7fdf3d7c143a /puppet/manifests/site.pp
parent3c3ed940466eabf9cb56a47614133b5bc90d4ad7 (diff)
parent5d54af627590acd9606e570fbb1ccb87e1237a76 (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp66
1 files changed, 29 insertions, 37 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 33566f0c..d422bef7 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -5,41 +5,33 @@ stage { 'initial':
before => Stage['main'],
}
-node 'default' {
- # prerequisites
- import 'common'
- include concat::setup
-
- $development = hiera('development')
- if $development['site_config'] == true {
- # include some basic classes
- include site_config
- } else {
- notice ('NOT applying site_config')
- }
-
- # parse services for host
- $services=hiera_array('services')
- notice("Services for $fqdn: $services")
-
- # configure eip
- if 'openvpn' in $services {
- include site_openvpn
- }
-
- if 'couchdb' in $services {
- include site_couchdb
- }
-
- if 'webapp' in $services {
- include site_webapp
- }
-
- if 'ca' in $services {
- include site_ca_daemon
- }
-
- if 'monitor' in $services {
- include site_nagios::server
- }
+# prerequisites
+import 'common'
+include concat::setup
+include site_config::default
+include site_config::slow
+
+# parse services for host
+$services=hiera_array('services')
+notice("Services for ${fqdn}: ${services}")
+
+# configure eip
+if 'openvpn' in $services {
+ include site_openvpn
+}
+
+if 'couchdb' in $services {
+ include site_couchdb
+}
+
+if 'webapp' in $services {
+ include site_webapp
+}
+
+if 'ca' in $services {
+ include site_ca_daemon
+}
+
+if 'monitor' in $services {
+ include site_nagios
}