summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/default.pp
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-rw-r--r--puppet/modules/site_config/manifests/default.pp5
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index c7352857..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
@@ -18,7 +19,7 @@ class site_config::default {
include site_config::sysctl
# configure ssh and include ssh-keys
- include site_config::sshd
+ include site_sshd
# include classes for special environments
# i.e. openstack/aws nodes, vagrant nodes
@@ -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
}