Compare commits

..

No commits in common. "libertacasa" and "master" have entirely different histories.

3 changed files with 10 additions and 18 deletions

View File

@ -1,6 +1,6 @@
name: memcached
os: RedHat, Debian, Arch, Gentoo, SUSE
os_family: RedHat, Debian, Arch, Gentoo, Suse
os: RedHat, Debian, Arch, Gentoo
os_family: RedHat, Debian, Arch, Gentoo
version: 201601
release: 1
minimum_version: 2015.8

View File

@ -4,6 +4,12 @@
include:
- memcached
memcached_user:
user.present:
- name : {{ get_config_item('user') }}
- createhome: False
- shell: /sbin/nologin
{{ memcached.config_file }}:
file:
- managed
@ -11,7 +17,6 @@ include:
- 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' %}
@ -21,19 +26,8 @@ include:
{% 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 %}

View File

@ -35,8 +35,6 @@
'config_file': '/etc/memcached.conf',
'libmemcached': 'libmemcached-devel',
'rootuser': rootuser,
'user': 'memcached',
'group': 'memcached',
},
'FreeBSD':{
'server': 'memcached',