diff options
| author | varac <varacanero@zeromail.org> | 2015-04-13 23:16:00 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-01-22 09:50:33 +0100 |
| commit | 150579fb14716892cc3e4d7d9c0f81b30d56f03a (patch) | |
| tree | 1cec18fffe6d70edd64696802cba264693f38ff5 /puppet/modules/soledad/manifests/server.pp | |
| parent | d87a8787908fb1c82901d9611a971c9bed0a3907 (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/modules/soledad/manifests/server.pp')
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 3 |
1 files changed, 3 insertions, 0 deletions
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'] |