diff options
| author | varac <varacanero@zeromail.org> | 2013-07-30 22:48:22 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-08-14 13:20:35 +0200 |
| commit | 2530cd5fa6dbf39dc964b158d79d6d5c60babc4e (patch) | |
| tree | d1beb00897144716de4fc7e2d8c60eb94298f7ac /puppet/manifests/setup.pp | |
| parent | 7d6893194cf1b6b8f4b3afa407d70dc90fe25f6c (diff) | |
vagrant: Install squid-deb-proxy on clients (optional) (Feature #3330)
squashed commits:
site_squid_deb_proxy::client: include shorewall::rules::mdns for avahi discovery
added submodule squid_deb_proxy from git://code.leap.se/puppet_squid_deb_proxy
updated submodule squid_deb_proxy
use squid_deb_proxy::client
Diffstat (limited to 'puppet/manifests/setup.pp')
| -rw-r--r-- | puppet/manifests/setup.pp | 6 |
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 +} + |