From d435efc4cf321e7303a0d70c39b24e17ef4d2771 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 2 Mar 2016 23:23:10 +0100 Subject: [PATCH] bacula: squeeze cleanup Signed-off-by: Julien Cristau --- modules/bacula/manifests/client.pp | 12 ------------ .../templates/apt.preferences.bacula-client.erb | 3 --- 2 files changed, 15 deletions(-) delete mode 100644 modules/bacula/templates/apt.preferences.bacula-client.erb diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp index 1ff49df9c..98af74a4a 100644 --- a/modules/bacula/manifests/client.pp +++ b/modules/bacula/manifests/client.pp @@ -48,18 +48,6 @@ class bacula::client inherits bacula { require => Package['bacula-fd'], notify => Service['bacula-fd'], } - if $::lsbmajdistrelease < 7 { - file { '/etc/apt/preferences.d/dsa-bacula-client': - content => template('bacula/apt.preferences.bacula-client.erb'), - mode => '0444', - owner => root, - group => root, - } - } else { - file { '/etc/apt/preferences.d/dsa-bacula-client': - ensure => absent - } - } @ferm::rule { 'dsa-bacula-fd-v4': domain => '(ip)', diff --git a/modules/bacula/templates/apt.preferences.bacula-client.erb b/modules/bacula/templates/apt.preferences.bacula-client.erb deleted file mode 100644 index 94ba9701f..000000000 --- a/modules/bacula/templates/apt.preferences.bacula-client.erb +++ /dev/null @@ -1,3 +0,0 @@ -Package: bacula-fd bacula-common -Pin: release n=squeeze-backports -Pin-Priority: 500 -- 2.20.1