3 files changed, 12 insertions, 27 deletions
diff --git a/puppet/modules/site_apt/manifests/preferences/passenger.pp b/puppet/modules/site_apt/manifests/preferences/passenger.pp
deleted file mode 100644
index 8cd41f91..00000000
--- a/puppet/modules/site_apt/manifests/preferences/passenger.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# currently, this is only used by static_site to get passenger v4.
-#
-# UPGRADE: this is not needed for jessie.
-#
-class site_apt::preferences::passenger {
-
-  apt::preferences_snippet { 'passenger':
-    package  => 'libapache2-mod-passenger',
-    release  => "${::lsbdistcodename}-backports",
-    priority => 999;
-  }
-
-}
diff --git a/puppet/modules/site_apt/manifests/preferences/python_cryptography.pp b/puppet/modules/site_apt/manifests/preferences/python_cryptography.pp
new file mode 100644
index 00000000..d725c1af
--- /dev/null
+++ b/puppet/modules/site_apt/manifests/preferences/python_cryptography.pp
@@ -0,0 +1,12 @@
+# Pin python-cryptography to jessie-backports in order to
+# satisfy leap-mx dependency (>=17.0)
+# see https://0xacab.org/leap/platform/issues/8837
+class site_apt::preferences::python_cryptography {
+
+  apt::preferences_snippet { 'python_cryptography':
+    package  => 'python-cryptography python-openssl python-pyasn1 python-setuptools python-pkg-resources python-cffi',
+    release  => "${::lsbdistcodename}-backports",
+    priority => 999;
+  }
+
+}
diff --git a/puppet/modules/site_apt/manifests/preferences/rsyslog.pp b/puppet/modules/site_apt/manifests/preferences/rsyslog.pp
deleted file mode 100644
index bfeaa7da..00000000
--- a/puppet/modules/site_apt/manifests/preferences/rsyslog.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class site_apt::preferences::rsyslog {
-
-  apt::preferences_snippet {
-    'rsyslog_anon_depends':
-      package  => 'libestr0 librelp0 rsyslog*',
-      priority => '999',
-      pin      => 'release a=wheezy-backports',
-      before   => Class['rsyslog::install'];
-
-    'fixed_rsyslog_anon_package':
-      ensure => absent;
-  }
-}