From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 13 May 2015 09:07:59 +0000 (+0200)
Subject: there is a volatile for freebsd after all
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=52533de765eda83313f7f06aa2dd3cdb795679e2;p=mirror%2Fdsa-puppet.git

there is a volatile for freebsd after all
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index ce88c13e6..8b0d62b57 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -159,16 +159,10 @@ class debian-org {
 		components => ['main','contrib','non-free']
 	}
 
-	if (($::lsbmajdistrelease) >= 8 and ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386'])) {
-		site::aptrepo { 'volatile':
-			ensure => absent,
-		}
-	} else {
-		site::aptrepo { 'volatile':
-			url        => $mirror,
-			suite      => "${::lsbdistcodename}-updates",
-			components => ['main','contrib','non-free']
-		}
+	site::aptrepo { 'volatile':
+		url        => $mirror,
+		suite      => "${::lsbdistcodename}-updates",
+		components => ['main','contrib','non-free']
 	}
 
 	#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or