X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Frabbitmq%2Fmanifests%2Finit.pp;h=33182da0c532135bd8a4ea322ff70ca0092f7936;hb=917f80937c03a7f486d25fa70373f1f4d4b02958;hp=5e12bd4be07d06094fc7ceccd15fda0d53890543;hpb=0daa0d704c7bc516b1e9a481109e881005144aee;p=mirror%2Fdsa-puppet.git

diff --git a/modules/rabbitmq/manifests/init.pp b/modules/rabbitmq/manifests/init.pp
index 5e12bd4be..33182da0c 100644
--- a/modules/rabbitmq/manifests/init.pp
+++ b/modules/rabbitmq/manifests/init.pp
@@ -32,20 +32,20 @@ class rabbitmq (
 		content => template('rabbitmq/rabbitmq.conf.erb'),
 	}
 
+	concat::fragment { 'rabbit_foot':
+		target  => '/etc/rabbitmq/rabbitmq.config',
+		order   => 50,
+		content => "]}\n"
+	}
+
 	concat::fragment { 'rabbitmq_conf_foot':
 		target  => '/etc/rabbitmq/rabbitmq.config',
 		order   => 99,
 		content => "].\n"
 	}
 
-	file { '/etc/rabbitmq/rabbitmq.conf.d/':
-		ensure  => directory,
-		require => Package['rabbitmq-server']
-	}
-
-	file { '/etc/rabbitmq/rabbitmq.conf.d/ulimit.conf':
+	file { '/etc/default/rabbitmq-server':
 		content => template('rabbitmq/rabbitmq.ulimit.erb'),
-		require => [ Package['rabbitmq-server'], File['/etc/rabbitmq/rabbitmq.conf.d/'] ],
 		notify  => Service['rabbitmq-server']
 	}