Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for debian 9 #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion manifests/cache.pp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
class rrd::cache (
$ensure = 'installed',
$service = 'running',
$listen = $rrd::params::cache_listen,
$sock_file = $rrd::params::cache_sock_file,
$listen = "unix:${sock_file}",
$gid = undef,
$journal_dir = $rrd::params::cache_journal_dir,
$timeout = $rrd::params::cache_timeout,
Expand Down
2 changes: 1 addition & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defaults and variables
class rrd::params {

$cache_listen = 'unix:/var/run/rrdcached.sock'
$cache_sock_file = '/var/run/rrdcached.sock'
$cache_journal_dir = '/var/lib/rrdcached/journal/'
$cache_timeout = '1800'
$cache_delay = '1800'
Expand Down
4 changes: 3 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
"operatingsystem": "Debian",
"operatingsystemrelease": [
"6",
"7"
"7",
"8",
"9"
]
},
{
Expand Down
8 changes: 8 additions & 0 deletions templates/rrdcached.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ DISABLE=<%= @service_enable ? '0' : '1' %>
# (do not specify -p <pidfile> - this is handled by the init script)
# default: see /etc/init.d/rrdcached
OPTS="-t <%= @write_threads %> -w <%= @timeout %> -z <%= @delay %> -j <%= @journal_dir %> <%- if @gid -%> -s <%= @gid %><% end %> -l <%= @listen %><%= @always_flush ? ' -F' : '' %> -b <%= @jump_dir %><%= @restrict_writes ? ' -B' : '' %>"
WRITE_THREADS="<%= @write_threads %>"
WRITE_TIMEOUT="<%= @timeout %>"
WRITE_JITTER="<%= @delay %>"
JOURNAL_PATH="<%= @journal_dir %>"
<%- if @gid -%>SOCKGROUP="<%= @gid %>"<% end %>
SOCKFILE="<%= @sock_file %>"
BASE_OPTIONS="<%= @always_flush ? ' -F' : '' %> <%= @restrict_writes ? ' -B' : '' %>"
BASE_PATH="<%= @jump_dir %>"

# number of seconds to wait for rrdcached to shut down
# (writing the data to disk may take some time;
Expand Down