summaryrefslogtreecommitdiff
path: root/puppet/modules/soledad/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-10-20 16:32:06 +0200
committervarac <varacanero@zeromail.org>2016-10-20 16:32:06 +0200
commit312689623bee05b631ad3df34f20f1ad067ab4b3 (patch)
tree4df55626e8a08d7d9d46888156fe0819d570cbaf /puppet/modules/soledad/manifests
parent09d4a5de6d7a9e05b85db4a410e9572b7e9408e2 (diff)
parentc752039fdf59e5c8a18c5dc7c611bd996e323eec (diff)
Merge branch 'twisted_backports' into develop
Diffstat (limited to 'puppet/modules/soledad/manifests')
-rw-r--r--puppet/modules/soledad/manifests/common.pp3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/modules/soledad/manifests/common.pp b/puppet/modules/soledad/manifests/common.pp
index 8d8339d4..35969362 100644
--- a/puppet/modules/soledad/manifests/common.pp
+++ b/puppet/modules/soledad/manifests/common.pp
@@ -1,6 +1,9 @@
# install soledad-common, both needed both soledad-client and soledad-server
class soledad::common {
+ # install twisted from jessie backports
+ include ::site_apt::preferences::twisted
+
package { 'soledad-common':
ensure => latest;
}