From 150579fb14716892cc3e4d7d9c0f81b30d56f03a Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 13 Apr 2015 23:16:00 +0200 Subject: restructured site.pp, now only one class gets included in site.pp per service (Bug #6851) Also, moved global Exec{} defaults to site.pp Change-Id: I9ae91b77afde944d2f1312613b9d9030e32239dd --- puppet/manifests/site.pp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'puppet/manifests') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 91dd2d3c..6bafff8e 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -2,12 +2,10 @@ # the logoutput exec parameter defaults to "on_error" in puppet 3, # but to "false" in puppet 2.7, so we need to set this globally here Exec { - logoutput => on_failure, - path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' + logoutput => on_failure, + path => '/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin' } -include site_config::setup -include site_config::default $services = hiera('services', []) $services_str = join($services, ', ') @@ -15,7 +13,6 @@ notice("Services for ${fqdn}: ${services_str}") if member($services, 'openvpn') { include site_openvpn - include site_obfsproxy } if member($services, 'couchdb') { @@ -24,7 +21,6 @@ if member($services, 'couchdb') { if member($services, 'webapp') { include site_webapp - include site_nickserver } if member($services, 'soledad') { @@ -50,5 +46,3 @@ if member($services, 'static') { if member($services, 'obfsproxy') { include site_obfsproxy } - -include site_config::packages::uninstall -- cgit v1.2.3