diff --git a/mongodb/defaults/main.yml b/mongodb/defaults/main.yml
index d7274b9..d0709b2 100644
--- a/mongodb/defaults/main.yml
+++ b/mongodb/defaults/main.yml
@@ -2,6 +2,8 @@
 mongodb_install_from_external_repo: True
 mongodb_install_packages: True
 mongodb_install_conf: True
+mongodb_latest_version: True
+mongodb_specific_version: 2.4.3
 mongodb_start_server: 'yes'
 mongodb_tcp_port: 27017
 mongodb_http_interface: False
@@ -9,9 +11,14 @@ mongodb_http_port: 28017
 mongodb_user: mongodb
 mongodb_group: mongodb
 mongodb_logdir: /var/log/mongodb
-mongodb_logpath: '{{ mongodb_logdir }}/mongodb.log'
+mongodb_log_file: mongodb.log
+mongodb_logpath: '{{ mongodb_logdir }}/{{ mongodb_log_file }}'
 mongodb_dbpath: /var/lib/mongodb
+mongodb_log_retain_days: 7
 mongodb_directoryperdb: False
 mongodb_allowed_hosts:
   - 127.0.0.1/8
   - '{{ ansible_default_ipv4.address }}/32'
+
+mongodb_cluster_enabled: False
+mongodb_replicaset: storagedev
diff --git a/mongodb/tasks/main.yml b/mongodb/tasks/main.yml
index 2404adf..aad4f6c 100644
--- a/mongodb/tasks/main.yml
+++ b/mongodb/tasks/main.yml
@@ -17,13 +17,24 @@
   ignore_errors: True
   tags: mongodb
 
-- name: Install the mongodb server
-  apt: pkg={{ item }} state=installed
+- name: Install the latest version of mongodb server
+  apt: pkg={{ item }} state=latest
   with_items:
     - mongodb-10gen
   when:
     - mongodb_install_from_external_repo
     - mongodb_install_packages
+    - mongodb_latest_version
+  tags: mongodb
+
+- name: Install the mongodb server
+  apt: pkg={{ item }}={{ mongodb_specific_version }} state=present
+  with_items:
+    - mongodb-10gen
+  when:
+    - mongodb_install_from_external_repo
+    - mongodb_install_packages
+    - not mongodb_latest_version
   tags: mongodb
 
 - name: Install the mongodb server
@@ -56,6 +67,10 @@
   notify: Restart mongodb
   tags: mongodb
 
+- name: Install the cron job that manages log files rotation
+  template: src=mongo_log_rotate.sh.j2 dest=/etc/cron.daily/mongo_log_rotate owner=root group=root mode=0555
+  tags: mongodb
+
 - name: Ensure mongodb is started
   service: name=mongodb state=started enabled=yes
   when: ( mongodb_start_server is defined ) and ( mongodb_start_server == 'yes' ) and ( mongodb_install_conf )
diff --git a/mongodb/templates/mongo_log_rotate.sh.j2 b/mongodb/templates/mongo_log_rotate.sh.j2
new file mode 100644
index 0000000..7f5e494
--- /dev/null
+++ b/mongodb/templates/mongo_log_rotate.sh.j2
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+MONGO_PID_FILE={{ mongodb_dbpath }}/mongod.lock
+LOG_RETAIN_DAYS={{ mongodb_log_retain_days }}
+RETVAL=
+
+MONGO_PID=$( cat $MONGO_PID_FILE )
+# Tell mongo to rotate its log file
+kill -SIGUSR1 $MONGO_PID
+
+RETVAL=$?
+
+# Remove the old log files
+find {{ mongodb_logdir }} -name "{{ mongodb_log_file }}.*" -ctime +$LOG_RETAIN_DAYS -exec rm -f {} \;
diff --git a/mongodb/templates/mongodb-2.4.conf.j2 b/mongodb/templates/mongodb-2.4.conf.j2
index 87745e2..47ea9f2 100644
--- a/mongodb/templates/mongodb-2.4.conf.j2
+++ b/mongodb/templates/mongodb-2.4.conf.j2
@@ -80,5 +80,8 @@ nohttpinterface = true
 #master = true
 #source = slave.example.com
 
+{% if mongodb_cluster_enabled %}
 # in replica set configuration, specify the name of the replica set
-# replSet = setname
+replSet = {{ mongodb_replicaset }}
+{% endif %}
+