From 150579fb14716892cc3e4d7d9c0f81b30d56f03a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
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/modules/soledad/manifests/server.pp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'puppet/modules/soledad')

diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 5c5a1bb7..f46c1eff 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -1,7 +1,10 @@
 # setup soledad-server
 class soledad::server {
   tag 'leap_service'
+
+  include site_config::default
   include soledad::common
+  include site_apt::preferences::twisted
 
   $soledad              = hiera('soledad')
   $couchdb_user         = $soledad['couchdb_soledad_user']['username']
-- 
cgit v1.2.3