From 2530cd5fa6dbf39dc964b158d79d6d5c60babc4e Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 30 Jul 2013 22:48:22 +0200
Subject: 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
---
 puppet/manifests/setup.pp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'puppet/manifests/setup.pp')

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
+}
+
-- 
cgit v1.2.3