diff --git a/koji.spec b/koji.spec index 6373f2ab..83dca60a 100644 --- a/koji.spec +++ b/koji.spec @@ -118,6 +118,12 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/sysconfig/kojira %{_sysconfdir}/kojira %config(noreplace) %{_sysconfdir}/kojira/kojira.conf +%{_sbindir}/koji-gc +%{_sysconfdir}/koji-gc +%config(noreplace) %{_sysconfdir}/koji-gc/koji-gc.conf +%{_sbindir}/koji-shadow +%{_sysconfdir}/koji-shadow +%config(noreplace) %{_sysconfdir}/koji-shadow/koji-shadow.conf %files web %defattr(-,root,root) diff --git a/util/Makefile b/util/Makefile index 20c36cbb..79ac64fa 100644 --- a/util/Makefile +++ b/util/Makefile @@ -1,4 +1,4 @@ -BINFILES = kojira +BINFILES = kojira koji-gc koji-shadow _default: @echo "nothing to make. try make install" @@ -23,3 +23,9 @@ install: mkdir -p $(DESTDIR)/etc/kojira install -p -m 644 kojira.conf $(DESTDIR)/etc/kojira/kojira.conf + + mkdir -p $(DESTDIR)/etc/koji-gc + install -p -m 644 koji-gc.conf $(DESTDIR)/etc/koji-gc/koji-gc.conf + + mkdir -p $(DESTDIR)/etc/koji-shadow + install -p -m 644 koji-shadow.conf $(DESTDIR)/etc/koji-shadow/koji-shadow.conf diff --git a/util/koji-gc b/util/koji-gc index 5d31734c..69acdea3 100755 --- a/util/koji-gc +++ b/util/koji-gc @@ -139,7 +139,7 @@ def get_options(): parser.error(_("No such file: %s") % cf) assert False else: - cf = '/etc/koji-gc.conf' + cf = '/etc/koji-gc/koji-gc.conf' if not os.access(cf, os.F_OK): cf = None if not cf: diff --git a/util/koji-shadow b/util/koji-shadow index e64d45b6..dcd3e422 100755 --- a/util/koji-shadow +++ b/util/koji-shadow @@ -103,7 +103,7 @@ def get_options(): parser.error(_("No such file: %s") % cf) assert False else: - cf = '/etc/koji-shadow.conf' + cf = '/etc/koji-shadow/koji-shadow.conf' if not os.access(cf, os.F_OK): cf = None if not cf: diff --git a/util/koji-shadow.conf b/util/koji-shadow.conf new file mode 100644 index 00000000..dc1a3fd1 --- /dev/null +++ b/util/koji-shadow.conf @@ -0,0 +1,7 @@ +# koji-shadow example config file +# (still working out all the config options) + +[main] +server=http://localhost/kojihub/ +remote=http://koji.fedoraproject.org/kojihub +