From 8e2741648a595c97f2b8f924bf3dbc85d44e7708 Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Fri, 6 Nov 2015 10:05:29 -0800
Subject: [PATCH] forgot to add openssh preferences file for wheezy
---
files/ssh/etc/apt/preferences.d/openssh.wheezy | 9 +++++++++
manifests/ssh/package.pp | 5 ++---
2 files changed, 11 insertions(+), 3 deletions(-)
create mode 100644 files/ssh/etc/apt/preferences.d/openssh.wheezy
diff --git a/files/ssh/etc/apt/preferences.d/openssh.wheezy b/files/ssh/etc/apt/preferences.d/openssh.wheezy
new file mode 100644
index 0000000..14a6726
--- /dev/null
+++ b/files/ssh/etc/apt/preferences.d/openssh.wheezy
@@ -0,0 +1,9 @@
+# Use the openssh from backports on wheezy systems
+
+Package: openssh-server
+Pin: release a=wheezy-backports
+Pin-Priority: 991
+
+Package: openssh-client
+Pin: release a=wheezy-backports
+Pin-Priority: 991
diff --git a/manifests/ssh/package.pp b/manifests/ssh/package.pp
index e5e763e..3ee3363 100644
--- a/manifests/ssh/package.pp
+++ b/manifests/ssh/package.pp
@@ -17,10 +17,9 @@ class base::ssh::package (
}
elsif ($::lsbmajdistrelease == 7) {
# On wheezy, pin the backported openssh
- file {
- '/etc/apt/preferences.d/openssh':
+ file { '/etc/apt/preferences.d/openssh':
ensure => present,
- source => 'puppet:///modules/base/ssh/etc/apt/preferences.d/openssh',
+ source => 'puppet:///modules/base/ssh/etc/apt/preferences.d/openssh.wheezy',
}
}
}
--
GitLab