summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/default.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-06-14 21:23:15 +0200
committervarac <varacanero@zeromail.org>2013-06-14 21:23:15 +0200
commit85e8d0851e0f53c742c9e26133c250864ad71e8e (patch)
tree60eb55997d3ea01183140859634853bb3b6078d3 /puppet/modules/site_config/manifests/default.pp
parent8ee0d3af919b169e1cb096a777beff68dbeb61d3 (diff)
parentbb4b3845130cabffe2e23c7b9112389179a56523 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-rw-r--r--puppet/modules/site_config/manifests/default.pp2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 7758a69d..cfb46130 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -36,4 +36,6 @@ class site_config::default {
Class['git'] -> Vcsrepo<||>
+ # include basic shell config
+ include site_config::shell
}