From 41cd6f5116f959bd902c8ae16f1a13aa22eff808 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 26 Aug 2013 10:36:15 +0100 Subject: [PATCH] change to how ulimit is set now Signed-off-by: Stephen Gran --- modules/rabbitmq/manifests/init.pp | 8 +------- modules/rabbitmq/templates/rabbitmq.ulimit.erb | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/rabbitmq/manifests/init.pp b/modules/rabbitmq/manifests/init.pp index ba3c11f2e..33182da0c 100644 --- a/modules/rabbitmq/manifests/init.pp +++ b/modules/rabbitmq/manifests/init.pp @@ -44,14 +44,8 @@ class rabbitmq ( 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'] } diff --git a/modules/rabbitmq/templates/rabbitmq.ulimit.erb b/modules/rabbitmq/templates/rabbitmq.ulimit.erb index 813f5000f..d1544b39c 100644 --- a/modules/rabbitmq/templates/rabbitmq.ulimit.erb +++ b/modules/rabbitmq/templates/rabbitmq.ulimit.erb @@ -1 +1 @@ -ulimit -n <%= scope.lookupvar('rabbit_num_ofiles') %> +ulimit -n <%= @rabbit_num_ofiles %> -- 2.20.1