From 54159f8e879ffeb878141ad1af62bff30843546b Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 23 Feb 2018 18:41:07 +0100 Subject: [PATCH] mongodb: configuration is forced by default but it's configurable --- CHANGELOG.md | 1 + mongodb/README.md | 1 + mongodb/defaults/main.yml | 2 ++ mongodb/tasks/main_jessie.yml | 3 +-- mongodb/tasks/main_stretch.yml | 3 +-- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4668336..c60147cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The **patch** part changes incrmentally at each release. * elasticsearch: use ES_TMPDIR variable for custom tmpdir, (from `/etc/default/elasticsearch` instead of changing `/etc/elesticsearch/jvm.options`). * elasticsearch: RESTART_ON_UPGRADE is configurable (default: `true`) * nagios-nrpe: mark plugins as executable +* mongodb: configuration is forced by default but it's configurable (default: `true`) * nginx: package name can be specified (default: `nginx-full`) ### Fixed diff --git a/mongodb/README.md b/mongodb/README.md index 5362827c..8796089a 100644 --- a/mongodb/README.md +++ b/mongodb/README.md @@ -12,5 +12,6 @@ Everything is in the `tasks/main.yml` file. * `mongodb_port`: port to listen to (default: `27017`) * `mongodb_bind`: IP to bind to (default: `127.0.0.1`) +* `mongodb_force_config`: force copy the configuration (default: `true`) The full list of variables (with default values) can be found in `defaults/main.yml`. diff --git a/mongodb/defaults/main.yml b/mongodb/defaults/main.yml index 273db2ab..e920d99d 100644 --- a/mongodb/defaults/main.yml +++ b/mongodb/defaults/main.yml @@ -2,3 +2,5 @@ mongodb_port: 27017 mongodb_bind: 127.0.0.1 + +mongodb_force_config: True diff --git a/mongodb/tasks/main_jessie.yml b/mongodb/tasks/main_jessie.yml index 220ad3c5..3aa7775a 100644 --- a/mongodb/tasks/main_jessie.yml +++ b/mongodb/tasks/main_jessie.yml @@ -26,8 +26,7 @@ template: src: mongod_jessie.conf.j2 dest: "/etc/mongod.conf" - force: yes - backup: no + force: "{{ mongodb_force_config | bool | ternary('yes', 'no') }}" notify: restart mongod - name: Configure logrotate diff --git a/mongodb/tasks/main_stretch.yml b/mongodb/tasks/main_stretch.yml index 8674455d..416ea727 100644 --- a/mongodb/tasks/main_stretch.yml +++ b/mongodb/tasks/main_stretch.yml @@ -17,8 +17,7 @@ template: src: mongodb_stretch.conf.j2 dest: "/etc/mongodb.conf" - force: yes - backup: no + force: "{{ mongodb_force_config | bool | ternary('yes', 'no') }}" notify: restart mongodb - name: enable service