Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FORMULA
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: memcached
os: RedHat, Debian, Arch, Gentoo
os_family: RedHat, Debian, Arch, Gentoo
os: RedHat, Debian, Arch, Gentoo, SUSE
os_family: RedHat, Debian, Arch, Gentoo, Suse
version: 201601
release: 1
minimum_version: 2015.8
Expand Down
14 changes: 14 additions & 0 deletions memcached/config.sls
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ memcached_user:
- user: root
- group: root
- mode: 644
{%- if grains['os_family'] != 'Suse' %}
{% if grains['os_family'] == 'Debian' %}
- source: salt://memcached/templates/memcached.conf
{% elif grains['os_family'] == 'RedHat' %}
Expand All @@ -26,8 +27,21 @@ memcached_user:
{% elif grains['os_family'] == 'Arch' %}
- source: salt://memcached/templates/empty
{% endif %}
{%- endif %}
- watch_in:
- service: memcached
- require:
- user: memcached_user

{%- if grains['os_family'] == 'Suse' %}
memcached_settings_suse:
file.keyvalue:
- name: {{ memcached.config_file }}
- separator: '='
- key_values:
MEMCACHED_USER: '{{ get_config_item('user') }}'
MEMCACHED_GROUP: '{{ get_config_item('group') }}'
MEMCACHED_PARAMS: '-l {{ get_config_item('listen_address') }}'
- watch_in:
- service: memcached
{%- endif %}
2 changes: 2 additions & 0 deletions memcached/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
'config_file': '/etc/memcached.conf',
'libmemcached': 'libmemcached-devel',
'rootuser': rootuser,
'user': 'memcached',
'group': 'memcached',
},
'FreeBSD':{
'server': 'memcached',
Expand Down