summaryrefslogtreecommitdiff
path: root/puppet/manifests/site.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-04-22 14:13:46 -0400
committerMicah Anderson <micah@leap.se>2014-04-22 14:13:46 -0400
commit327d5c934e408f90011d7949b89ab01fed88998e (patch)
tree77cfefffc8f9ffe160c4413b26dd5ca5cdd6f1e8 /puppet/manifests/site.pp
parentca11482dd7cd4ea8ffa69407ee2fd5b5e1b7981b (diff)
parent4295f334ea4f92d7fb47f7121a42633630c368d1 (diff)
Merge branch 'develop' (0.5.0)
Conflicts: .gitignore Change-Id: I778f3e1f1f4832f5894bc149ead67e9a4becf304
Diffstat (limited to 'puppet/manifests/site.pp')
-rw-r--r--puppet/manifests/site.pp27
1 files changed, 17 insertions, 10 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 08cbbb9e..f8726fa9 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -2,19 +2,11 @@
Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
# parse services for host
-$services=join(hiera_array('services'), ' ')
+$services=join(hiera_array('services', ['']), ' ')
notice("Services for ${fqdn}: ${services}")
-# make sure apt is updated before any packages are installed
-include apt::update
-Package { require => Exec['apt_updated'] }
-
-include stdlib
-
-import 'common'
+include site_config::setup
include site_config::default
-include site_config::slow
-
# configure eip
if $services =~ /\bopenvpn\b/ {
@@ -23,6 +15,7 @@ if $services =~ /\bopenvpn\b/ {
if $services =~ /\bcouchdb\b/ {
include site_couchdb
+ include tapicero
}
if $services =~ /\bwebapp\b/ {
@@ -30,6 +23,10 @@ if $services =~ /\bwebapp\b/ {
include site_nickserver
}
+if $services =~ /\bsoledad\b/ {
+ include soledad::server
+}
+
if $services =~ /\bmonitor\b/ {
include site_nagios
}
@@ -37,3 +34,13 @@ if $services =~ /\bmonitor\b/ {
if $services =~ /\btor\b/ {
include site_tor
}
+
+if $services =~ /\bmx\b/ {
+ include site_mx
+}
+
+if $services =~ /\bstatic\b/ {
+ include site_static
+}
+
+include site_config::packages::uninstall