Merge lp:~niedbalski/charms/precise/rabbitmq-server/ulimit-increase into lp:charms/rabbitmq-server

[Jorge Niedbalski]

- Alternative proposal for LP: #220434

* Increase default ulimit to something more scalable.
* This can be pushed to the trusty charm branch as well.

[Charles Butler (lazypower)]

+1 LGTM - i like this better in security/limits vs in defaults. TY for this merge.

review: Approve

[James Page (james-page)]

Does this apply correctly on a reboot? I've seen issues in the past where limits configuration is not applied correctly prior to services starting up.

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-06-11 19:58:50 +0000
+++ hooks/rabbitmq_server_relations.py	2014-06-11 20:08:31 +0000
@@ -516,7 +516,8 @@
     add_source(config('source'), config('key'))
     apt_update(fatal=True)
     # Copy in defaults file for updated ulimits
-    shutil.copyfile('templates/rabbitmq-server', '/etc/default/rabbitmq-server')
+    shutil.copyfile('templates/rabbitmq.limits.conf',
+                    '/etc/security/limits.d/rabbitmq.limits.conf')
     # Install packages to ensure any changes to source
     # result in an upgrade if applicable.
     apt_install(rabbit.PACKAGES, fatal=True)
 
=== removed file 'templates/rabbitmq-server'
--- templates/rabbitmq-server	2014-05-01 10:40:32 +0000
+++ templates/rabbitmq-server	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-# Generated by juju
-# bump ulimit so rabbit can support lots of connections
-ulimit -n 65536
 
=== added file 'templates/rabbitmq.limits.conf'
--- templates/rabbitmq.limits.conf	1970-01-01 00:00:00 +0000
+++ templates/rabbitmq.limits.conf	2014-06-11 20:08:31 +0000
@@ -0,0 +1,5 @@
+# Generated by juju
+# bump ulimit so rabbit can support lots of connections
+
+rabbitmq        soft    nofile          65536
+rabbitmq        hard    nofile          65536