From 2530cd5fa6dbf39dc964b158d79d6d5c60babc4e Mon Sep 17 00:00:00 2001 From: varac 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 From 3cdebf3ebe73cb2859dc852dcc73a8ee2d60e976 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 20 Aug 2013 19:45:56 -0400 Subject: install a preliminary firewall that blocks everything, except ssh for the cases when shorewall doesn't properly come up, ensuring that it fails safe (#3339) Change-Id: Id4f0bf6cf25f420aa2ad67635b37ae95f54e3d38 --- puppet/manifests/setup.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'puppet/manifests/setup.pp') diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index d9e5229e..84e4c056 100644 --- a/puppet/manifests/setup.pp +++ b/puppet/manifests/setup.pp @@ -9,6 +9,8 @@ include concat::setup include site_config::hosts +include site_config::initial_firewall + include site_apt package { 'facter': -- cgit v1.2.3 From ca3f34da520ff835d383aa82f528adf927d3364f Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 18 Sep 2013 12:20:43 +0200 Subject: include shorewall::interface{eth0} in setup.pp so packages can be installed during main puppetrun, even before shorewall is configured completly --- puppet/manifests/setup.pp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'puppet/manifests/setup.pp') diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index 84e4c056..ba58e728 100644 --- a/puppet/manifests/setup.pp +++ b/puppet/manifests/setup.pp @@ -22,3 +22,11 @@ if hiera('squid_deb_proxy_client', false) { include site_squid_deb_proxy::client } +# shorewall is installed/half-configured during setup.pp (Bug #3871) +# we need to include shorewall::interface{eth0} in setup.pp so +# packages can be installed during main puppetrun, even before shorewall +# is configured completly +if ( $::virtual == 'virtualbox' ) { + include site_config::vagrant +} + -- cgit v1.2.3 From 99df31cdd58ca60b90c0098b126903e2d8251128 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 16 Oct 2013 21:30:16 +0200 Subject: vagrant: support other providers besides virtualbox (Bug #4158), Part 2 took out the last remaining virtualbox references --- puppet/manifests/setup.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'puppet/manifests/setup.pp') diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index ba58e728..84124f5a 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 site_config::params + include concat::setup include site_config::hosts @@ -26,7 +28,7 @@ if hiera('squid_deb_proxy_client', false) { # we need to include shorewall::interface{eth0} in setup.pp so # packages can be installed during main puppetrun, even before shorewall # is configured completly -if ( $::virtual == 'virtualbox' ) { +if ( $::site_config::params::environment == 'local' ) { include site_config::vagrant } -- cgit v1.2.3 From d272b9a45b1099a17719fbe3c77b24f10b5de5cb Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 20 Oct 2013 20:59:22 +0200 Subject: Possibility to include local puppet recipes (Feature #3976) --- puppet/manifests/setup.pp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'puppet/manifests/setup.pp') diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index 84124f5a..f89b7032 100644 --- a/puppet/manifests/setup.pp +++ b/puppet/manifests/setup.pp @@ -32,3 +32,8 @@ if ( $::site_config::params::environment == 'local' ) { include site_config::vagrant } +# if class site_custom::setup exists, include it. +# possibility for users to define custom puppet recipes +if defined( '::site_custom::setup') { + include ::site_custom::setup +} -- cgit v1.2.3 From 1457c4a85ad3e7f2fbdc6f969b801542b3396581 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 25 Mar 2014 23:42:19 +0100 Subject: Move setup.pp to a subclass (site_config::setup) (Feature #2993) --- puppet/manifests/setup.pp | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'puppet/manifests/setup.pp') diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp index f89b7032..4dd03203 100644 --- a/puppet/manifests/setup.pp +++ b/puppet/manifests/setup.pp @@ -1,39 +1,5 @@ # # this is applied before each run of site.pp # -$services = '' -Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } - -include site_config::params - -include concat::setup - -include site_config::hosts - -include site_config::initial_firewall - -include site_apt - -package { 'facter': - ensure => latest, - require => Exec['refresh_apt'] -} - -if hiera('squid_deb_proxy_client', false) { - include site_squid_deb_proxy::client -} - -# shorewall is installed/half-configured during setup.pp (Bug #3871) -# we need to include shorewall::interface{eth0} in setup.pp so -# packages can be installed during main puppetrun, even before shorewall -# is configured completly -if ( $::site_config::params::environment == 'local' ) { - include site_config::vagrant -} - -# if class site_custom::setup exists, include it. -# possibility for users to define custom puppet recipes -if defined( '::site_custom::setup') { - include ::site_custom::setup -} +include ::site_config::setup -- cgit v1.2.3