diff --git a/templates/memcached.redhat.j2 b/templates/memcached.conf.redhat.j2 similarity index 100% rename from templates/memcached.redhat.j2 rename to templates/memcached.conf.redhat.j2 diff --git a/templates/memcached.debian.j2 b/templates/memcached.debian.j2 deleted file mode 100644 index a6223d2..0000000 --- a/templates/memcached.debian.j2 +++ /dev/null @@ -1,6 +0,0 @@ -# {{ ansible_managed }} -# Any other value will disable memcached. -ENABLE_MEMCACHED=yes - -ulimit -Hn {{ memcached_connections }} -ulimit -n {{ memcached_connections }} diff --git a/templates/memcached.gentoo.j2 b/templates/memcached.gentoo.j2 deleted file mode 100644 index eef5bd2..0000000 --- a/templates/memcached.gentoo.j2 +++ /dev/null @@ -1,17 +0,0 @@ -# {{ ansible_managed }} -{% if debug | bool %} - {% set _verbosity = '-vv' %} -{% else %} - {% set _verbosity = '-v' %} -{% endif %} - -MEMCACHED_BINARY="/usr/bin/memcached" -PIDBASE="/var/run/memcached/memcached" -MEMUSAGE="{{ memcached_memory }}" -MEMCACHED_RUNAS="{{ memcached_user }}" -MAXCONN="{{ memcached_connections }}" -LISTENON="{{ memcached_listen }}" -PORT="{{ memcached_port }}" -UDPPORT="${PORT}" -MISC_OPTS="-t {{ memcached_threads }} {{ _verbosity }}" - diff --git a/templates/memcached.suse.j2 b/templates/memcached.suse.j2 deleted file mode 100644 index 7555982..0000000 --- a/templates/memcached.suse.j2 +++ /dev/null @@ -1,29 +0,0 @@ -# {{ ansible_managed }} - -{% if debug | bool %} - {% set _verbosity = '-vv' %} -{% else %} - {% set _verbosity = '-v' %} -{% endif %} - -MEMCACHED_PARAMS="-U 0 -l {{ memcached_listen }} -p {{ memcached_port }} -c {{ memcached_connections }} -t {{ memcached_threads }} {{ _verbosity }}" - -## Path: Network/WWW/Memcached -## Description: username memcached should run as -## Type: string -## Default: "memcached" -## Config: memcached -# -# username memcached should run as -# -MEMCACHED_USER="{{ memcached_user }}" - -## Path: Network/WWW/Memcached -## Description: group memcached should be run as -## Type: string -## Default: "memcached" -## Config: memcached -# -# group memcached should be run as -# -MEMCACHED_GROUP="memcached" diff --git a/vars/redhat.yml b/vars/redhat.yml index 39edb4b..86017d0 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -19,6 +19,6 @@ memcached_distro_packages: - memcached - nc -memcached_conf_template: memcached.redhat.j2 +memcached_conf_template: memcached.conf.redhat.j2 memcached_conf_dest: /etc/sysconfig/memcached