From 4c3919d9201e38d47de52a4882652d7ba01312a5 Mon Sep 17 00:00:00 2001 From: Sergei Antipov Date: Tue, 17 Feb 2015 19:16:14 +0600 Subject: [PATCH] Changes in variables definition --- defaults/main.yml | 25 +++++++++++++------------ templates/mongod.conf.j2 | 25 +++++++++++++------------ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 3a53018..47d4176 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,24 +8,25 @@ mongodb_additional_packages: mongodb_user: mongodb mongodb_daemon_name: "{{ 'mongod' if ('mongodb-org' in mongodb_package) else 'mongodb' }}" -mongodb_conf_auth: "no" # Run with security +mongodb_conf_auth: false # Run with security mongodb_conf_bind_ip: 127.0.0.1 # Comma separated list of ip addresses to listen on -mongodb_conf_cpu: "yes" # Periodically show cpu and iowait utilization +mongodb_conf_cpu: true # Periodically show cpu and iowait utilization mongodb_conf_dbpath: /data/db # Directory for datafiles -mongodb_conf_fork: "no" # Fork server process -mongodb_conf_httpinterface: "no" # Enable http interface -mongodb_conf_ipv6: "no" # Enable IPv6 support (disabled by default) -mongodb_conf_journal: "no" # Enable journaling -mongodb_conf_logappend: "yes" # Append to logpath instead of over-writing +mongodb_conf_fork: false # Fork server process +mongodb_conf_httpinterface: false # Enable http interface +mongodb_conf_ipv6: false # Enable IPv6 support (disabled by default) +mongodb_conf_journal: true # Enable journaling +mongodb_conf_logappend: true # Append to logpath instead of over-writing mongodb_conf_logpath: /var/log/mongodb/{{ mongodb_daemon_name }}.log # Log file to send write to instead of stdout mongodb_conf_maxConns: 1000000 # Max number of simultaneous connections -mongodb_conf_noprealloc: "no" # Disable data file preallocation -mongodb_conf_noscripting: "no" # Disable scripting engine -mongodb_conf_notablescan: "no" # Do not allow table scans +mongodb_conf_noprealloc: false # Disable data file preallocation +mongodb_conf_smallfiles: false # Disable smallfiles option +mongodb_conf_noscripting: false # Disable scripting engine +mongodb_conf_notablescan: false # Do not allow table scans mongodb_conf_port: 27017 # Specify port number -mongodb_conf_quota: "no" # Limits each database to a certain number of files +mongodb_conf_quota: false # Limits each database to a certain number of files mongodb_conf_quotaFiles: 8 # Number of quota files -mongodb_conf_syslog: "no" # Log to system's syslog facility instead of file +mongodb_conf_syslog: false # Log to system's syslog facility instead of file # Replica set options: mongodb_conf_replSet: # Enable replication [/] diff --git a/templates/mongod.conf.j2 b/templates/mongod.conf.j2 index e9b062d..cc05032 100644 --- a/templates/mongod.conf.j2 +++ b/templates/mongod.conf.j2 @@ -1,23 +1,24 @@ # {{ ansible_managed }} -auth = {{ mongodb_conf_auth }} +auth = {{ mongodb_conf_auth|to_nice_json }} bind_ip = {{ mongodb_conf_bind_ip }} -cpu = {{ mongodb_conf_cpu }} +cpu = {{ mongodb_conf_cpu|to_nice_json }} dbpath = {{ mongodb_conf_dbpath }} -fork = {{ mongodb_conf_fork }} -httpinterface = {{ mongodb_conf_httpinterface }} -ipv6 = {{ mongodb_conf_ipv6 }} -journal = {{ mongodb_conf_journal }} -logappend = {{ mongodb_conf_logappend }} +fork = {{ mongodb_conf_fork|to_nice_json }} +httpinterface = {{ mongodb_conf_httpinterface|to_nice_json }} +ipv6 = {{ mongodb_conf_ipv6|to_nice_json }} +journal = {{ mongodb_conf_journal|to_nice_json }} +logappend = {{ mongodb_conf_logappend|to_nice_json }} logpath = {{ mongodb_conf_logpath }} maxConns = {{ mongodb_conf_maxConns }} -noprealloc = {{ mongodb_conf_noprealloc }} -noscripting = {{ mongodb_conf_noscripting }} -notablescan = {{ mongodb_conf_notablescan }} +noprealloc = {{ mongodb_conf_noprealloc|to_nice_json }} +noscripting = {{ mongodb_conf_noscripting|to_nice_json }} +notablescan = {{ mongodb_conf_notablescan|to_nice_json }} port = {{ mongodb_conf_port }} -quota = {{ mongodb_conf_quota }} +quota = {{ mongodb_conf_quota|to_nice_json }} quotaFiles = {{ mongodb_conf_quotaFiles }} -syslog = {{ mongodb_conf_syslog }} +syslog = {{ mongodb_conf_syslog|to_nice_json }} +smallfiles = {{ mongodb_conf_smallfiles|to_nice_json }} {% if mongodb_conf_replSet %} # Replica set options: