From 1ee211b3a0e721c063d8e594ce74e1d9ff19f272 Mon Sep 17 00:00:00 2001
From: Kirill Klenov <horneds@gmail.com>
Date: Tue, 2 Sep 2014 23:14:06 +0100
Subject: [PATCH] Sort options, update contributors.

---
 .travis.yml              |  1 +
 CONTRIBUTORS             |  4 ++++
 README.md                | 33 ++++++++++++++++-----------------
 defaults/main.yml        | 27 +++++++++++++--------------
 tasks/mongodb.yml        |  1 +
 templates/mongod.conf.j2 |  2 +-
 6 files changed, 36 insertions(+), 32 deletions(-)
 create mode 100644 CONTRIBUTORS

diff --git a/.travis.yml b/.travis.yml
index f7e03cc..bbf62d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python: "2.7"
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq python-apt python-pycurl
+ - sudo apt-get remove --purge -y mongodb-*
 install:
   - pip install ansible>=1.6.0
 script:
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
new file mode 100644
index 0000000..942a79f
--- /dev/null
+++ b/CONTRIBUTORS
@@ -0,0 +1,4 @@
+Contributors:
+
+* Kirill Klenov (http://klen.github.io/)
+* Guillaume Dedrie (https://github.com/guillaumededrie)
diff --git a/README.md b/README.md
index 32bb12c..fd497b4 100644
--- a/README.md
+++ b/README.md
@@ -11,36 +11,35 @@ Ansible role which manage [MongoDB](http://www.mongodb.org/)
 #### Variables
 
 ```yaml
+
 mongodb_enabled: yes
 mongodb_packages:
   - python-selinux
   - python-pymongo
-  - mongodb-10gen
+  - mongodb-org
 
-# Configuration
-# A list of hashes that are used to configure MongoDB. Any valid configuration parameters can be defined here.
 mongodb_conf:
-  dbpath: /var/lib/mongodb/
-  logpath: /var/log/mongodb/mongod.log
-  logappend: "true"
-  port: 27017
-  bind_ip: 127.0.0.1
-  nojournal: "true"
-  # auth: "true"
-  noauth: "true"
-  cpu: "true"
-  verbose: "true"
-  vvvv: "true"
-  quota: "false"
   auth: "false"
-  objcheck: "false"
+  bind_ip: 127.0.0.1
+  cpu: "true"
+  dbpath: /var/lib/mongodb/
   # diaglog: 0 # deprecated
+  logappend: "true"
+  logpath: /var/log/mongodb/mongod.log
+  noauth: "true"
   nohints: "false"
   nohttpinterface: "false"
+  nojournal: "true"
+  noprealloc: "false"
   noscripting: "false"
   notablescan: "false"
-  noprealloc: "false"
+  objcheck: "false"
+  port: 27017
+  quota: "false"
   # replSet: "" # Set for enable replication
+  verbose: "true"
+  vvvv: "true"
+
 
 # Log rotation
 mongodb_logrotate: yes                             # Rotate mongodb logs.
diff --git a/defaults/main.yml b/defaults/main.yml
index ded60f4..04b46a5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,27 +7,26 @@ mongodb_packages:
   - mongodb-org
 
 mongodb_conf:
-  dbpath: /var/lib/mongodb/
-  logpath: /var/log/mongodb/mongod.log
-  logappend: "true"
-  port: 27017
-  bind_ip: 127.0.0.1
-  nojournal: "true"
-  # auth: "true"
-  noauth: "true"
-  cpu: "true"
-  verbose: "true"
-  vvvv: "true"
-  quota: "false"
   auth: "false"
-  objcheck: "false"
+  bind_ip: 127.0.0.1
+  cpu: "true"
+  dbpath: /var/lib/mongodb/
   # diaglog: 0 # deprecated
+  logappend: "true"
+  logpath: /var/log/mongodb/mongod.log
+  noauth: "true"
   nohints: "false"
   nohttpinterface: "false"
+  nojournal: "true"
+  noprealloc: "false"
   noscripting: "false"
   notablescan: "false"
-  noprealloc: "false"
+  objcheck: "false"
+  port: 27017
+  quota: "false"
   # replSet: "" # Set for enable replication
+  verbose: "true"
+  vvvv: "true"
 
 
 # Log rotation
diff --git a/tasks/mongodb.yml b/tasks/mongodb.yml
index a6bc996..164f09f 100644
--- a/tasks/mongodb.yml
+++ b/tasks/mongodb.yml
@@ -5,5 +5,6 @@
 
 - name: Ensure mongodb is started
   service: name=mongod state=started
+  changed_when: False
 
 - include: configure.yml
diff --git a/templates/mongod.conf.j2 b/templates/mongod.conf.j2
index 9c34a41..3b354b2 100644
--- a/templates/mongod.conf.j2
+++ b/templates/mongod.conf.j2
@@ -1,5 +1,5 @@
 # {{ ansible_managed }}
 
-{% for k, v in mongodb_conf.iteritems() %}
+{% for k, v in mongodb_conf.iteritems()|sort %}
 {{ k }} = {{ v }}
 {% endfor %}