Merge pull request #28 from noelmcloughlin/fix

fix(jinja): fix jinja syntax
This commit is contained in:
N 2020-08-28 23:04:47 +02:00 committed by GitHub
commit ba7fdda416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,13 +11,13 @@
'log_file': '/var/log/memcached.log', 'log_file': '/var/log/memcached.log',
'memory_cap': 64, 'memory_cap': 64,
'port': 11211, 'port': 11211,
'user':' memcache', 'user': 'memcache',
'listen_address': '127.0.0.1', 'listen_address': '127.0.0.1',
'max_connections': 1024, 'max_connections': 1024,
'lock_paged_memory': False, 'lock_paged_memory': False,
'error_on_mem_full': False, 'error_on_mem_full': False,
'max_core_file_limit': False, 'max_core_file_limit': False,
'slab_size_limit': '1m', 'slab_size_limit': '1m'
} }
} %} } %}
{% set memcached = salt['grains.filter_by']({ {% set memcached = salt['grains.filter_by']({
@ -26,7 +26,7 @@
'service': 'memcached', 'service': 'memcached',
'python': 'python-python-memcached', 'python': 'python-python-memcached',
'config_file': '/etc/memcached.conf', 'config_file': '/etc/memcached.conf',
'rootuser': {{ rootuser }}, 'rootuser': rootuser,
}, },
'Suse':{ 'Suse':{
'server': 'memcached', 'server': 'memcached',
@ -34,14 +34,14 @@
'python': 'python-python-memcached', 'python': 'python-python-memcached',
'config_file': '/etc/memcached.conf', 'config_file': '/etc/memcached.conf',
'libmemcached': 'libmemcached-devel', 'libmemcached': 'libmemcached-devel',
'rootuser': {{ rootuser }}, 'rootuser': rootuser,
}, },
'FreeBSD':{ 'FreeBSD':{
'server': 'memcached', 'server': 'memcached',
'service': 'memcached', 'service': 'memcached',
'config_file': '/usr/local/etc/rc.d/memcached', 'config_file': '/usr/local/etc/rc.d/memcached',
'libmemcached': 'libmemcached-devel', 'libmemcached': 'libmemcached-devel',
'rootuser': {{ rootuser }}, 'rootuser': rootuser,
}, },
'Debian':{ 'Debian':{
'server': 'memcached', 'server': 'memcached',
@ -49,7 +49,7 @@
'python': 'python-memcache', 'python': 'python-memcache',
'config_file': '/etc/memcached.conf', 'config_file': '/etc/memcached.conf',
'libmemcached': 'libmemcached-dev', 'libmemcached': 'libmemcached-dev',
'rootuser': {{ rootuser }}, 'rootuser': rootuser,
}, },
'RedHat': { 'RedHat': {
'server': 'memcached', 'server': 'memcached',
@ -57,7 +57,7 @@
'python': 'python-memcached', 'python': 'python-memcached',
'config_file': '/etc/sysconfig/memcached', 'config_file': '/etc/sysconfig/memcached',
'libmemcached': 'libmemcached-devel', 'libmemcached': 'libmemcached-devel',
'rootuser': {{ rootuser }}, 'rootuser': rootuser,
}, },
'Gentoo':{ 'Gentoo':{
'server': 'net-misc/memcached', 'server': 'net-misc/memcached',
@ -65,7 +65,7 @@
'python': 'dev-python/python-memcache', 'python': 'dev-python/python-memcache',
'config_file': '/etc/conf.d/memcached', 'config_file': '/etc/conf.d/memcached',
'libmemcached': 'dev-libs/libmemcached', 'libmemcached': 'dev-libs/libmemcached',
'rootuser': {{ rootuser }}, 'rootuser': rootuser,
}, },
'Arch':{ 'Arch':{
'server': 'memcached', 'server': 'memcached',
@ -73,6 +73,6 @@
'python': 'python2-memcached', 'python': 'python2-memcached',
'config_file': '/etc/memcached', 'config_file': '/etc/memcached',
'libmemcached': 'libmemcached', 'libmemcached': 'libmemcached',
'rootuser': {{ rootuser }}, 'rootuser': rootuser,
}, },
}, merge=salt['pillar.get']('memcached:lookup')) %} }, merge=salt['pillar.get']('memcached:lookup')) %}