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 0000000000000000000000000000000000000000..14a6726bde75100227b7f69f3e1350f20147af53 --- /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 e5e763ee9efea53947ab73b93579324977eea75a..3ee336350a017ad78b76895806f5901902cf3b2f 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', } } }