diff options
Diffstat (limited to 'puppet/manifests/site.pp')
| -rw-r--r-- | puppet/manifests/site.pp | 10 |
1 files changed, 2 insertions, 8 deletions
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 |