From 64dd074d3e44a04d901bba1611e2cbbfa700f7c3 Mon Sep 17 00:00:00 2001 From: Daniel Schmitz Date: Wed, 3 Feb 2016 19:13:57 +0800 Subject: [PATCH 1/5] Debians init.d script uses $DAEMON_OPTS instead of $DAEMON_ARGS --- templates/config.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/config.erb b/templates/config.erb index cbbdf1d..73877b5 100644 --- a/templates/config.erb +++ b/templates/config.erb @@ -1 +1,2 @@ DAEMON_ARGS='-c /etc/nutcracker.yml' +DAEMON_OPTS=$DAEMON_ARGS From 4c201e9ce4470312b0a08dc4d0203e5dff29fafc Mon Sep 17 00:00:00 2001 From: Daniel Schmitz Date: Wed, 3 Feb 2016 19:14:26 +0800 Subject: [PATCH 2/5] Use package_name for default-file --- manifests/config.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/config.pp b/manifests/config.pp index a149dbb..af34229 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', From 1d2cd2b6805b0074f606e28ed56c1f1bc6517d25 Mon Sep 17 00:00:00 2001 From: Daniel Schmitz Date: Wed, 3 Feb 2016 19:20:33 +0800 Subject: [PATCH 3/5] Corrected quotes --- manifests/config.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/config.pp b/manifests/config.pp index af34229..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::package_name}': + file { "/etc/default/${twemproxy::package_name}": owner => 'root', group => 'root', mode => '0644', From 4db447cd711ff9bff24bca15d7c7e05b2781409a Mon Sep 17 00:00:00 2001 From: Daniel Schmitz Date: Wed, 3 Feb 2016 19:25:39 +0800 Subject: [PATCH 4/5] Added parameters to default-config --- templates/config.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/config.erb b/templates/config.erb index 73877b5..e72b469 100644 --- a/templates/config.erb +++ b/templates/config.erb @@ -1,2 +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 From 39389ed41d9f57d2a31b7b00e942062e94b114e0 Mon Sep 17 00:00:00 2001 From: Daniel Schmitz Date: Wed, 3 Feb 2016 19:27:20 +0800 Subject: [PATCH 5/5] Added variables to init --- manifests/init.pp | 3 +++ 1 file changed, 3 insertions(+) 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': } ->