Attachment 888216 Details for Bug 995753 – koji-utils sysvinit → systemd

[patch] koji-utils sysvinit → systemd

0003-Add-systemd-unit-file-for-kojira.patch (text/plain), 3.58 KB, created by Zbigniew Jędrzejewski-Szmek on 2014-04-21 19:33:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zbigniew Jędrzejewski-Szmek

Created: 2014-04-21 19:33:15 UTC

Size: 3.58 KB

patch

obsolete

>From 21e1e787835cfa9f5427bcaba18379818cc0c5de Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
>Date: Mon, 21 Apr 2014 14:52:28 -0400
>Subject: [PATCH 3/3] Add systemd unit file for kojira
>
>---
> koji.spec           | 22 ++++++++++++++++++++++
> util/Makefile       | 23 ++++++++++++++++-------
> util/kojira.service | 14 ++++++++++++++
> 3 files changed, 52 insertions(+), 7 deletions(-)
> create mode 100644 util/kojira.service
>
>diff --git a/koji.spec b/koji.spec
>index 29adeb1..72b43c2 100644
>--- a/koji.spec
>+++ b/koji.spec
>@@ -132,6 +132,11 @@ Group: Applications/Internet
> License: LGPLv2
> Requires: postgresql-python
> Requires: %{name} = %{version}-%{release}
>+%if %{use_systemd}
>+Requires(post): systemd
>+Requires(preun): systemd
>+Requires(postun): systemd
>+%endif
> 
> %description utils
> Utilities for the Koji system
>@@ -190,8 +195,12 @@ rm -rf $RPM_BUILD_ROOT
> %files utils
> %defattr(-,root,root)
> %{_sbindir}/kojira
>+%if %{use_systemd}
>+%{_unitdir}/kojira.service
>+%else
> %{_initrddir}/kojira
> %config(noreplace) %{_sysconfdir}/sysconfig/kojira
>+%endif
> %dir %{_sysconfdir}/kojira
> %config(noreplace) %{_sysconfdir}/kojira/kojira.conf
> %{_sbindir}/koji-gc
>@@ -286,6 +295,18 @@ if [ $1 = 0 ]; then
> fi
> %endif
> 
>+%if %{use_systemd}
>+
>+%post utils
>+%systemd_post kojira.service
>+
>+%preun utils
>+%systemd_preun kojira.service
>+
>+%postun utils
>+%systemd_postun kojira.service
>+
>+%else
> %post utils
> /sbin/chkconfig --add kojira
> /sbin/service kojira condrestart &> /dev/null || :
>@@ -294,6 +315,7 @@ if [ $1 = 0 ]; then
>   /sbin/service kojira stop &> /dev/null || :
>   /sbin/chkconfig --del kojira
> fi
>+%endif
> 
> %changelog
> * Mon Mar 24 2014 Mike McLean <mikem at redhat.com> - 1.9.0-1
>diff --git a/util/Makefile b/util/Makefile
>index 79ac64f..5ea8bde 100644
>--- a/util/Makefile
>+++ b/util/Makefile
>@@ -1,4 +1,6 @@
> BINFILES = kojira koji-gc koji-shadow
>+SYSTEMDSYSTEMUNITDIR = $(shell pkg-config systemd --variable=systemdsystemunitdir)
>+TYPE = systemd
> 
> _default:
> 	@echo "nothing to make. try make install"
>@@ -6,7 +8,7 @@ _default:
> clean:
> 	rm -f *.o *.so *.pyc *~
> 
>-install:
>+_install:
> 	@if [ "$(DESTDIR)" = "" ]; then \
> 		echo " "; \
> 		echo "ERROR: A destdir is required"; \
>@@ -15,12 +17,6 @@ install:
> 	mkdir -p $(DESTDIR)/usr/sbin
> 	install -p -m 755 $(BINFILES) $(DESTDIR)/usr/sbin
> 
>-	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
>-
> 	mkdir -p $(DESTDIR)/etc/kojira
> 	install -p -m 644 kojira.conf $(DESTDIR)/etc/kojira/kojira.conf
> 
>@@ -29,3 +25,16 @@ install:
> 
> 	mkdir -p $(DESTDIR)/etc/koji-shadow
> 	install -p -m 644 koji-shadow.conf $(DESTDIR)/etc/koji-shadow/koji-shadow.conf
>+
>+install-systemd: _install
>+	mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
>+	install -p -m 644 kojira.service $(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
>+
>+install: install-$(TYPE)
>diff --git a/util/kojira.service b/util/kojira.service
>new file mode 100644
>index 0000000..beaea18
>--- /dev/null
>+++ b/util/kojira.service
>@@ -0,0 +1,14 @@
>+[Unit]
>+Description=Koji repo administration
>+Documentation=https://fedoraproject.org/wiki/Koji/ServerHowTo
>+
>+After=network.target
>+
>+[Service]
>+ExecStart=/usr/sbin/kojira \
>+       --fg \
>+       --force-lock \
>+       --verbose
>+
>+[Install]
>+WantedBy=multi-user.target
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 995753: 785270 | 785271 | 785272 | 785279 | 785280 | 785281 | 785282 | 887978 | 888215 | 888216 | 888217