diff options
Diffstat (limited to 'puppet/manifests/setup.pp')
| -rw-r--r-- | puppet/manifests/setup.pp | 36 |
1 files changed, 1 insertions, 35 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 |