From 7fd256cde15ea00f6ddb4428d3ad7313d5ba27ba Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Apr 08 2016 16:15:07 +0000 Subject: Add subdirectory for builder plugin configuration. --- diff --git a/plugins/Makefile b/plugins/Makefile index dd59f76..d4b1861 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -4,7 +4,7 @@ BUILDERPLUGINDIR = /usr/lib/koji-builder-plugins HUBFILES = $(wildcard hub/*.py) BUILDERFILES = $(wildcard builder/*.py) HUBCONFDIR = /etc/koji-hub/plugins -BUILDERCONFDIR = /etc/kojid +BUILDERCONFDIR = /etc/kojid/plugins HUBCONFFILES = $(wildcard hub/*.conf) BUILDERCONFFILES = $(wildcard builder/*.conf) diff --git a/plugins/builder/runroot.py b/plugins/builder/runroot.py index 9a71c91..b303890 100644 --- a/plugins/builder/runroot.py +++ b/plugins/builder/runroot.py @@ -23,7 +23,7 @@ except ImportError: __all__ = ('RunRootTask',) -CONFIG_FILE = '/etc/kojid/runroot.conf' +CONFIG_FILE = '/etc/kojid/plugins/runroot.conf' class RunRootTask(tasks.BaseTaskHandler):