$OpenBSD: patch-lib_carbon_conf_py,v 1.1.1.1 2012/10/11 18:00:30 jasper Exp $ --- lib/carbon/conf.py.orig Wed May 16 09:02:24 2012 +++ lib/carbon/conf.py Thu Oct 11 19:07:15 2012 @@ -452,6 +452,7 @@ def read_config(program, options, **kwargs): settings.setdefault(name, value) graphite_root = kwargs.get("ROOT_DIR") + graphite_root = '/var/graphite/' if graphite_root is None: graphite_root = os.environ.get('GRAPHITE_ROOT') if graphite_root is None: @@ -462,7 +463,7 @@ def read_config(program, options, **kwargs): # 'GRAPHITE_CONF_DIR' environment variable. settings.setdefault("CONF_DIR", os.environ.get("GRAPHITE_CONF_DIR", - join(graphite_root, "conf"))) + join("${SYSCONFDIR}", "graphite"))) if options["config"] is None: options["config"] = join(settings["CONF_DIR"], "carbon.conf") else: