Merge branch 'master' of github.com:saz/puppet-memcached

templates/memcached.conf.erb

@@ -7,16 +7,16 @@
 -P /var/run/memcached.pid
 
 # Log memcached's output
-logfile <%= logfile -%>
+logfile <%= @logfile -%>
 
 <% if @verbosity -%>
 # Verbosity
--<%= verbosity %>
+-<%= @verbosity %>
 <% end -%>
 
 # Use <num> MB memory max to use for object storage.
 <% Puppet::Parser::Functions.function('memcached_max_memory') -%>
--m <%= scope.function_memcached_max_memory([max_memory]) %>
+-m <%= scope.function_memcached_max_memory([@max_memory]) %>
 
 <% if @lock_memory -%>
 # Lock down all paged memory.  There is a limit on how much memory you may lock.
@@ -25,29 +25,29 @@ logfile <%= logfile -%>
 
 <% if @unix_socket -%>
 # UNIX socket path to listen on
--s <%= unix_socket %>
+-s <%= @unix_socket %>
 <% else -%>
 # IP to listen on
--l <%= listen_ip %>
+-l <%= @listen_ip %>
 
 # TCP port to listen on
--p <%= tcp_port %>
+-p <%= @tcp_port %>
 
 # UDP port to listen on
--U <%= udp_port %>
+-U <%= @udp_port %>
 <% end -%>
 
 # Run daemon as user
--u <%= user %>
+-u <%= @user %>
 
 # Limit the number of simultaneous incoming connections.
--c <%= max_connections %>
+-c <%= @max_connections %>
 
 # Number of threads to use to process incoming requests.
--t <%= processorcount %>
+-t <%= @processorcount %>
 
 <% if @item_size -%>
 # Override  the  default size of each slab page
--I <%= item_size %>
+-I <%= @item_size %>
 <% end -%>
 

templates/memcached_sysconfig.erb

@@ -1,8 +1,8 @@
-PORT="<%= tcp_port %>"
-USER="<%= user %>"
-MAXCONN="<%= max_connections %>"
+PORT="<%= @tcp_port %>"
+USER="<%= @user %>"
+MAXCONN="<%= @max_connections %>"
 <% Puppet::Parser::Functions.function('memcached_max_memory') -%>
-CACHESIZE="<%= scope.function_memcached_max_memory([max_memory]) %>"
+CACHESIZE="<%= scope.function_memcached_max_memory([@max_memory]) %>"
 OPTIONS="<%
 result = []
 if @verbosity