Set some additional default variables because the code doesn' t do what I expect.

[Jeff Rizzo <riz%tastylime.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jeff Rizzo <riz%tastylime.net@localhost>
Pushed By:	riz
Date:		Sun Dec 6 11:42:03 2015 -0800
Changeset:	8b4066e3aeca29b7701c8a4b9755872d114d615b

Modified Files:
	py-carbon/distinfo
	py-carbon/patches/patch-carbon_conf_example

Log Message:
Set some additional default variables because the code
doesn't do what I expect.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8b4066e3aeca29b7701c8a4b9755872d114d615b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-carbon/distinfo                          |  2 +-
 py-carbon/patches/patch-carbon_conf_example | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs:
diff --git a/py-carbon/distinfo b/py-carbon/distinfo
index 3d894d2..538f866 100644
--- a/py-carbon/distinfo
+++ b/py-carbon/distinfo
@@ -4,5 +4,5 @@ SHA1 (carbon-0.9.15.tar.gz) = 204e837684c29ac09069d740d009f070bfb942d3
 RMD160 (carbon-0.9.15.tar.gz) = 4a1b11d8ba06357f44e6eca3d45ee0f89dfef98a
 SHA512 (carbon-0.9.15.tar.gz) = cc56257e703fc262dd27019d4a4e86d483daf55bb4c0792200be82533fc721b087b9eb5926cd007bf1e1c0f799729de871de5182f807fa9e0394ba08eccfa2fe
 Size (carbon-0.9.15.tar.gz) = 57328 bytes
-SHA1 (patch-carbon_conf_example) = e38fea6ccedb662e5708b594ec237f2eeef1ffd7
+SHA1 (patch-carbon_conf_example) = 75153928e117e5a982dd00ae18b715f272854306
 SHA1 (patch-setup.py) = c9d08fcc91db9329b35ff79fdb08c1aa4bc0fd8d
diff --git a/py-carbon/patches/patch-carbon_conf_example b/py-carbon/patches/patch-carbon_conf_example
index f29675c..d1f52d9 100644
--- a/py-carbon/patches/patch-carbon_conf_example
+++ b/py-carbon/patches/patch-carbon_conf_example
@@ -3,12 +3,14 @@ $NetBSD$
 Set package-appropriate defaults
 
 --- conf/carbon.conf.example.orig	2015-11-27 10:37:07.000000000 -0800
-+++ conf/carbon.conf.example	2015-12-04 14:20:31.000000000 -0800
-@@ -30,6 +30,11 @@
++++ conf/carbon.conf.example	2015-12-06 11:41:02.000000000 -0800
+@@ -30,6 +30,13 @@
  #
  #LOCAL_DATA_DIR = /opt/graphite/storage/whisper/
  
 +STORAGE_DIR	= @GRAPHITE_DIR@
++LOCAL_DATA_DIR	= @GRAPHITE_DIR@/whisper
++WHITELISTS_DIR	= @GRAPHITE_DIR@/lists
 +CONF_DIR	= @PKG_SYSCONFDIR@
 +LOG_DIR		= @VARBASE@/log/graphite/
 +PID_DIR		= @VARBASE@/run/graphite/
@@ -16,7 +18,7 @@ Set package-appropriate defaults
  # Enable daily log rotation. If disabled, carbon will automatically re-open
  # the file if it's rotated out of place (e.g. by logrotate daemon)
  ENABLE_LOGROTATION = True
-@@ -37,7 +42,7 @@
+@@ -37,7 +44,7 @@
  # Specify the user to drop privileges to
  # If this is blank carbon runs as the user that invokes it
  # This user must have write access to the local data directory
@@ -25,11 +27,13 @@ Set package-appropriate defaults
  #
  # NOTE: The above settings must be set under [relay] and [aggregator]
  #       to take effect for those daemons as well
-@@ -235,6 +240,11 @@
+@@ -235,6 +242,13 @@
  
  
  [relay]
 +STORAGE_DIR	= @GRAPHITE_DIR@
++LOCAL_DATA_DIR	= @GRAPHITE_DIR@/whisper
++WHITELISTS_DIR	= @GRAPHITE_DIR@/lists
 +CONF_DIR	= @PKG_SYSCONFDIR@
 +LOG_DIR		= @VARBASE@/log/graphite/
 +PID_DIR		= @VARBASE@/run/graphite/
@@ -37,11 +41,13 @@ Set package-appropriate defaults
  LINE_RECEIVER_INTERFACE = 0.0.0.0
  LINE_RECEIVER_PORT = 2013
  PICKLE_RECEIVER_INTERFACE = 0.0.0.0
-@@ -322,6 +332,11 @@
+@@ -322,6 +336,13 @@
  
  
  [aggregator]
 +STORAGE_DIR	= @GRAPHITE_DIR@
++LOCAL_DATA_DIR	= @GRAPHITE_DIR@/whisper
++WHITELISTS_DIR	= @GRAPHITE_DIR@/lists
 +CONF_DIR	= @PKG_SYSCONFDIR@
 +LOG_DIR		= @VARBASE@/log/graphite/
 +PID_DIR		= @VARBASE@/run/graphite/