diff --git a/manifests/config.pp b/manifests/config.pp index a149dbb..80e31de 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,7 +1,7 @@ class twemproxy::config inherits twemproxy { if $twemproxy::package_manage { - file { '/etc/default/twemproxy': + file { "/etc/default/${twemproxy::package_name}": owner => 'root', group => 'root', mode => '0644', diff --git a/manifests/init.pp b/manifests/init.pp index b7c0849..dbec1ff 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -41,6 +41,9 @@ $client_port = $twemproxy::params::client_port, $client_weight = $twemproxy::params::client_weight, $clients_array = undef, + $stats_port = undef, + $stats_addr = undef, + $stats_interval = undef, ) inherits twemproxy::params { anchor { 'twemproxy::start': } -> diff --git a/templates/config.erb b/templates/config.erb index cbbdf1d..e72b469 100644 --- a/templates/config.erb +++ b/templates/config.erb @@ -1 +1,2 @@ -DAEMON_ARGS='-c /etc/nutcracker.yml' +DAEMON_ARGS='-c /etc/nutcracker.yml<%- if @stats_port -%> -s <%= @stats_port %><%- end -%><%- if @stats_addr -%> -a <%= @stats_addr %><%- end -%><%- if @stats_interval -%> -i <%= @stats_interval %><%- end -%>' +DAEMON_OPTS=$DAEMON_ARGS