From: Julien Cristau <jcristau@debian.org>
Date: Wed, 2 Mar 2016 22:23:10 +0000 (+0100)
Subject: bacula: squeeze cleanup
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d435efc4cf321e7303a0d70c39b24e17ef4d2771;hp=086a85e483cb3725ed4f0c75d9dfbf6c078a4299;p=mirror%2Fdsa-puppet.git

bacula: squeeze cleanup

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

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