From c752039fdf59e5c8a18c5dc7c611bd996e323eec Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 28 Sep 2016 11:06:05 +0200 Subject: [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 --- puppet/modules/site_mx/manifests/init.pp | 2 ++ puppet/modules/soledad/manifests/common.pp | 3 +++ 2 files changed, 5 insertions(+) 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; } -- cgit v1.2.3