diff --git a/memcached/map.jinja b/memcached/map.jinja index 46ed200..cd3ffe7 100644 --- a/memcached/map.jinja +++ b/memcached/map.jinja @@ -1,6 +1,6 @@ {% set defaults = { 'config':{ - 'deamonize': True, + 'daemonize': True, 'verbose_level': 0, 'log_file': '/var/log/memcached.log', 'memory_cap': 64, @@ -12,7 +12,7 @@ 'error_on_mem_full': False, 'max_core_file_limit': False, 'slab_size_limit': '1m', - } + } } %} {% set memcached = salt['grains.filter_by']({ 'Debian':{ diff --git a/memcached/templates/memcached.conf b/memcached/templates/memcached.conf index 6450497..b0c945d 100644 --- a/memcached/templates/memcached.conf +++ b/memcached/templates/memcached.conf @@ -7,7 +7,7 @@ # Run memcached as a daemon. This command is implied, and is not needed for the # daemon to run. See the README.Debian that comes with this package for more # information. -{{ '-d' if get_config_item('deamonize') == 'True' else ''}} +{{ '-d' if get_config_item('daemonize') == 'True' else ''}} # Log memcached's output to /var/log/memcached logfile {{ get_config_item('log_file') }} @@ -37,15 +37,15 @@ logfile {{ get_config_item('log_file') }} -c {{ get_config_item('max_connections') }} # Lock down all paged memory. Consult with the README and homepage before you do this -# -k +# -k {{ '-k' if get_config_item('lock_paged_memory') == 'True' else '' }} # Return error when memory is exhausted (rather than removing items) -# -M +# -M {{ '-M' if get_config_item('error_on_mem_full') == 'True' else '' }} # Maximize core file limit -# -r +# -r {{ '-r' if get_config_item('max_core_file_limit') == 'True' else '' }} {% if get_config_item('slab_size_limit') != '1m' %} diff --git a/pillar.example b/pillar.example index c94f803..f41af08 100644 --- a/pillar.example +++ b/pillar.example @@ -1,5 +1,5 @@ memcached: - deamonize: True + daemonize: True verbose_level: 0 memory_cap: 64 port: 11211