summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/setup.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index 80e7ffc2..d9e5229e 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -5,6 +5,8 @@ $services = ''
Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
+include concat::setup
+
include site_config::hosts
include site_apt
@@ -14,3 +16,7 @@ package { 'facter':
require => Exec['refresh_apt']
}
+if hiera('squid_deb_proxy_client', false) {
+ include site_squid_deb_proxy::client
+}
+