Update memcached role to latest version.

geerlingguy · Apr 19, 2021 · fb4675d · fb4675d
1 parent a3aaa45
commit fb4675d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
@@ -35,7 +35,7 @@ roles:
   - name: geerlingguy.mailhog
     version: 2.2.0
   - name: geerlingguy.memcached
-    version: 2.0.0
+    version: 2.1.0
   - name: geerlingguy.mysql
     version: 3.3.0
   - name: geerlingguy.nginx

diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-Debian.conf.j2
@@ -28,7 +28,13 @@ logfile {{ memcached_log_file }}
 # Specify which IP address to listen on. The default is to listen on all IP addresses
 # This parameter is one of the only security measures that memcached has, so make sure
 # it's listening on a firewalled interface.
+{% if memcached_listen_ip is string %}
 -l {{ memcached_listen_ip }}
+{% else %}
+{% for ip in memcached_listen_ip %}
+-l {{ ip }}
+{% endfor %}
+{% endif %}
 
 # Limit the number of simultaneous incoming connections. The daemon default is 1024
 -c {{ memcached_connections }}

diff --git a/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2 b/provisioning/roles/geerlingguy.memcached/templates/memcached-RedHat.conf.j2
@@ -17,4 +17,4 @@ CACHESIZE="{{ memcached_memory_limit }}"
 # -l Specify which IP address to listen on. The default is to listen on all IP addresses
 #    This parameter is one of the only security measures that memcached has, so make sure
 #    it's listening on a firewalled interface.
-OPTIONS="-l {{ memcached_listen_ip }} -I {{ memcached_max_item_size }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"
+OPTIONS="{% if memcached_listen_ip is string %}-l {{ memcached_listen_ip }} {% else %}{% for ip in memcached_listen_ip %}-l {{ ip }} {% endfor %}{% endif %}-I {{ memcached_max_item_size }} {{ memcached_log_verbosity }} >> {{ memcached_log_file }} 2>&1"