summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-04-10 17:30:35 +0200
committervarac <varacanero@zeromail.org>2014-04-10 17:30:35 +0200
commit98ed287783baad657bb2b0297de34629d14bb2f3 (patch)
tree1cd05629de1fe17395e8b375597fa1c4ac6e48ca /puppet/manifests
parent47c98e75f502c6ca77c4b46bb326959e569f501e (diff)
parentc8f9eaf3db509d8e678a7de0e363e14b91377e22 (diff)
Merge branch '0.6' into develop
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/setup.pp36
-rw-r--r--puppet/manifests/site.pp3
2 files changed, 3 insertions, 36 deletions
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
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index ff8f8c6c..f8726fa9 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -5,6 +5,7 @@ Exec { path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' }
$services=join(hiera_array('services', ['']), ' ')
notice("Services for ${fqdn}: ${services}")
+include site_config::setup
include site_config::default
# configure eip
@@ -42,4 +43,4 @@ if $services =~ /\bstatic\b/ {
include site_static
}
-include site_config::packages::uninstall \ No newline at end of file
+include site_config::packages::uninstall