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/modules/site_config | |
| 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/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index e299a0f4..0a4e75b6 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -44,4 +44,15 @@ class site_config::default { # set up core leap files and directories include site_config::files + + # redundant declarations, remove if + # "Move setup.pp to a subclass (site_config::setup) (Feature #2993)" + # is solved. + + # if squid_deb_proxy_client is set to true, install and configure + # squid_deb_proxy_client for apt caching + if hiera('squid_deb_proxy_client', false) { + include site_squid_deb_proxy::client + } + } |