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 ++++++
 puppet/modules/site_config/manifests/default.pp         | 11 +++++++++++
 puppet/modules/site_squid_deb_proxy/manifests/client.pp |  5 +++++
 puppet/modules/squid_deb_proxy                          |  1 +
 4 files changed, 23 insertions(+)
 create mode 100644 puppet/modules/site_squid_deb_proxy/manifests/client.pp
 create mode 160000 puppet/modules/squid_deb_proxy

(limited to 'puppet')

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
+}
+
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
+  }
+
 }
diff --git a/puppet/modules/site_squid_deb_proxy/manifests/client.pp b/puppet/modules/site_squid_deb_proxy/manifests/client.pp
new file mode 100644
index 00000000..27844270
--- /dev/null
+++ b/puppet/modules/site_squid_deb_proxy/manifests/client.pp
@@ -0,0 +1,5 @@
+class site_squid_deb_proxy::client {
+  include squid_deb_proxy::client
+  include site_shorewall::defaults
+  include shorewall::rules::mdns
+}
diff --git a/puppet/modules/squid_deb_proxy b/puppet/modules/squid_deb_proxy
new file mode 160000
index 00000000..e796aac4
--- /dev/null
+++ b/puppet/modules/squid_deb_proxy
@@ -0,0 +1 @@
+Subproject commit e796aac43aa9781069e167459253d040504c2092
-- 
cgit v1.2.3