From a75b1c22cb8f7fb46a2a5c01d55d5bdbb6d7eb7d Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Jun 30 2020 07:41:51 +0000 Subject: kojira: drop kojira.sysconfig Fixes: https://pagure.io/koji/issue/2171 --- diff --git a/docs/source/server_howto.rst b/docs/source/server_howto.rst index ffc8ea6..52093e3 100644 --- a/docs/source/server_howto.rst +++ b/docs/source/server_howto.rst @@ -1277,7 +1277,6 @@ Configuration Files ------------------- * ``/etc/kojira/kojira.conf`` - Kojira Daemon Configuration -* ``/etc/sysconfig/kojira`` - Kojira Daemon Switches Install kojira --------------- diff --git a/koji.spec b/koji.spec index 3c0d8b5..77d6df2 100644 --- a/koji.spec +++ b/koji.spec @@ -538,9 +538,6 @@ rm -rf $RPM_BUILD_ROOT %{_unitdir}/koji-gc.service %{_unitdir}/koji-gc.timer %{_unitdir}/kojira.service -%else -%{_initrddir}/kojira -%config(noreplace) /etc/sysconfig/kojira %endif %dir /etc/kojira %config(noreplace) /etc/kojira/kojira.conf diff --git a/util/Makefile b/util/Makefile index 0aa7e5c..7c068d3 100644 --- a/util/Makefile +++ b/util/Makefile @@ -38,10 +38,7 @@ install-systemd: _install install -p -m 644 koji-sweep-db.timer $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) install-sysv: _install - mkdir -p $(DESTDIR)/etc/rc.d/init.d - install -p -m 755 kojira.init $(DESTDIR)/etc/rc.d/init.d/kojira - - mkdir -p $(DESTDIR)/etc/sysconfig - install -p -m 644 kojira.sysconfig $(DESTDIR)/etc/sysconfig/kojira + # no more utils support for sysv + true install: install-$(TYPE) diff --git a/util/kojira.init b/util/kojira.init index 6ffdf56..31741a6 100644 --- a/util/kojira.init +++ b/util/kojira.init @@ -14,8 +14,6 @@ # Check that we're a privileged user [ `id -u` = 0 ] || exit 0 -[ -f /etc/sysconfig/kojira ] && . /etc/sysconfig/kojira - prog="kojira" # Check that networking is up. diff --git a/util/kojira.sysconfig b/util/kojira.sysconfig deleted file mode 100644 index 830c183..0000000 --- a/util/kojira.sysconfig +++ /dev/null @@ -1,4 +0,0 @@ -FORCE_LOCK=Y -KOJIRA_DEBUG=N -KOJIRA_VERBOSE=Y -RUNAS=root