summaryrefslogtreecommitdiff
path: root/puppet/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-04-13 23:16:00 +0200
committervarac <varacanero@zeromail.org>2016-01-22 09:50:33 +0100
commit150579fb14716892cc3e4d7d9c0f81b30d56f03a (patch)
tree1cec18fffe6d70edd64696802cba264693f38ff5 /puppet/manifests
parentd87a8787908fb1c82901d9611a971c9bed0a3907 (diff)
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
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/site.pp10
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