summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/default.pp
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-06-04 14:19:55 -0700
committerelijah <elijah@riseup.net>2014-06-04 14:19:55 -0700
commitf991e8a4c877cff1d274fd1cac26488f8c3fda84 (patch)
treea43a6f15bc9490fc40fb30e43b483d814770796e /puppet/modules/site_config/manifests/default.pp
parent79295764ebbefd346407b8042bc759552aa46234 (diff)
clean up how /etc/hosts is generated so it doesn't require custom behavior depending on the services.0.5.2
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-rw-r--r--puppet/modules/site_config/manifests/default.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index dfdffe03..fc2179de 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -1,6 +1,7 @@
class site_config::default {
tag 'leap_base'
+ $services = hiera('services', [])
$domain_hash = hiera('domain')
include site_config::params
@@ -54,7 +55,7 @@ class site_config::default {
# set up core leap files and directories
include site_config::files
- if $::services !~ /\bmx\b/ {
+ if ! member($services, 'mx') {
include site_postfix::satellite
}