diff options
Diffstat (limited to 'puppet/manifests/site.pp')
| -rw-r--r-- | puppet/manifests/site.pp | 27 |
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 |