X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=2466193cfcc7cab627c939be05b69f01f14ab10a;hb=55e8d03c4d97a031237a43a1aec3830b0dab5fc7;hp=a0c6d12025e3537e59c8b7310d7b094da94f2b77;hpb=f6e3a2e70e9571c48145865b1c5663ca150b9932;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index a0c6d1202..2466193cf 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -33,9 +33,16 @@ class named::geodns inherits named {
 		source => 'puppet:///modules/named/common/named.conf.local',
 		notify  => Service['bind9'],
 	}
-	file { '/etc/bind/named.conf.acl':
-		source => 'puppet:///modules/named/common/named.conf.acl',
-		notify  => Service['bind9'],
+        if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+		file { '/etc/bind/named.conf.acl':
+			source => 'puppet:///modules/named/common/named.conf.acl',
+			notify  => Service['bind9'],
+		}
+	} else {
+		file { '/etc/bind/named.conf.acl':
+			source => 'puppet:///modules/named/common/named.conf.acl.bind99',
+			notify  => Service['bind9'],
+		}
 	}
 	file { '/etc/bind/geodns/zonefiles':
 		ensure => directory,