2 files changed, 20 insertions, 14 deletions
diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp
index a9b0198b..c910a45a 100644
--- a/puppet/modules/site_mx/manifests/init.pp
+++ b/puppet/modules/site_mx/manifests/init.pp
@@ -1,20 +1,23 @@
+# Configure leap_mx on mx server
 class site_mx {
   tag 'leap_service'
-  Class['site_config::default'] -> Class['site_mx']
+  Class['::site_config::default'] -> Class['::site_mx']
 
-  include site_config::default
-  include site_config::x509::cert
-  include site_config::x509::key
-  include site_config::x509::ca
-  include site_config::x509::client_ca::ca
-  include site_config::x509::client_ca::key
+  include ::site_config::default
+  include ::site_config::x509::cert
+  include ::site_config::x509::key
+  include ::site_config::x509::ca
+  include ::site_config::x509::client_ca::ca
+  include ::site_config::x509::client_ca::key
 
-  include site_stunnel
+  include ::site_stunnel
 
-  include site_postfix::mx
-  include site_haproxy
-  include site_shorewall::mx
-  include site_shorewall::service::smtp
-  include leap_mx
-  include site_check_mk::agent::mx
+  include ::site_postfix::mx
+  include ::site_haproxy
+  include ::site_shorewall::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;
   }