summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-09-28 11:06:05 +0200
committervarac <varacanero@zeromail.org>2016-10-18 21:30:58 +0200
commitc752039fdf59e5c8a18c5dc7c611bd996e323eec (patch)
treea7a91f8e53282cba5417bace03357a3d81814456 /puppet
parent291d5718607a2df22ca58a0c110bee75452a085c (diff)
[feat] Use twisted 16.2 from jessie-backports
New soledad packages now depend on Twisted 16.2.0 (see https://leap.se/code/issues/8412), so we need to pin twisted to get installed from jessie-backports. - Resolves: #8418
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_mx/manifests/init.pp2
-rw-r--r--puppet/modules/soledad/manifests/common.pp3
2 files changed, 5 insertions, 0 deletions
diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp
index d18f4287..c910a45a 100644
--- a/puppet/modules/site_mx/manifests/init.pp
+++ b/puppet/modules/site_mx/manifests/init.pp
@@ -18,4 +18,6 @@ class site_mx {
include ::site_shorewall::service::smtp
include ::leap_mx
include ::site_check_mk::agent::mx
+ # install twisted from jessie backports
+ include ::site_apt::preferences::twisted
}
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;
}