From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=altlinux.org; s=dkim; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ro3I2KzZY6EiIEC3KzKvzyC0pfVQ5gFY2hK7EH4AWIg=; b=aQ55GMx9Nt7SsXdkESkbelNiEQ +lZIbyUs+HHbdHrp8jB9Dxo2IeMxZAft3A+8382DcIqjeNfrOwrwTNUxTSI2Tw+I2emZ7x/tPl8xw necGKa11s72Tkn2quwLN4dpXhSu/0+22ahcXFWTgmuUFA7RnVSiuYNIEStSXFXCEvIr14arFKR4Xp alD08cu4K8ayTSR+jSdmXFLbdOPSxmfdcZ7S2n2adKhBQq5IWdJEjjGaPP1Sowm/ZokbNWYRMralg W5QkPwBp1GUPfGBpjoepbGrOL0jSibMTbDmVejqnnisJyBK6cSeU1lo5a3LI38WimcT9y++ocDoVz DX2+dKfQ==; From: Arseny Maslennikov To: devel@lists.altlinux.org, ldv@altlinux.org Date: Thu, 22 Oct 2020 14:43:41 +0300 Message-Id: <20201022114343.1810141-5-arseny@altlinux.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201022114343.1810141-1-arseny@altlinux.org> References: <20201022114343.1810141-1-arseny@altlinux.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 37.204.119.143 X-SA-Exim-Mail-From: arseny@altlinux.org X-SA-Exim-Version: 4.2.1 X-SA-Exim-Scanned: Yes (on mail.cs.msu.ru) Cc: Alexey Gladkov Subject: [devel] [PATCH v2 4/6] Add systemd and sysvinit service files X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Oct 2020 11:44:02 -0000 Archived-At: List-Archive: List-Post: From: Alexey Gladkov Signed-off-by: Alexey Gladkov --- hasher-priv/Makefile | 6 ++ hasher-priv/hasher-priv.spec | 9 ++- hasher-priv/hasher-privd.service | 14 ++++ hasher-priv/hasher-privd.sysvinit | 103 ++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 hasher-priv/hasher-privd.service create mode 100755 hasher-priv/hasher-privd.sysvinit diff --git a/hasher-priv/Makefile b/hasher-priv/Makefile index 283249b..6e6b1e5 100644 --- a/hasher-priv/Makefile +++ b/hasher-priv/Makefile @@ -14,6 +14,8 @@ MAN8PAGES = $(PROJECT).8 hasher-useradd.8 TARGETS = $(PROJECT) hasher-privd hasher-useradd $(HELPERS) $(MAN5PAGES) $(MAN8PAGES) sysconfdir = /etc +initdir=$(sysconfdir)/rc.d/init.d +systemd_unitdir=/lib/systemd/system libexecdir = /usr/lib sbindir = /usr/sbin mandir = /usr/share/man @@ -73,6 +75,10 @@ install: all $(MKDIR_P) -m750 $(DESTDIR)$(helperdir) $(INSTALL) -p -m700 $(PROJECT) $(DESTDIR)$(helperdir)/ $(INSTALL) -p -m755 $(HELPERS) $(DESTDIR)$(helperdir)/ + $(MKDIR_P) -m755 $(DESTDIR)$(systemd_unitdir) + $(INSTALL) -p -m644 hasher-privd.service $(DESTDIR)$(systemd_unitdir)/ + $(MKDIR_P) -m755 $(DESTDIR)$(initdir) + $(INSTALL) -p -m755 hasher-privd.sysvinit $(DESTDIR)$(initdir)/hasher-privd $(MKDIR_P) -m755 $(DESTDIR)$(sbindir) $(INSTALL) -p -m755 hasher-privd $(DESTDIR)$(sbindir)/ $(INSTALL) -p -m755 hasher-useradd $(DESTDIR)$(sbindir)/ diff --git a/hasher-priv/hasher-priv.spec b/hasher-priv/hasher-priv.spec index fac25cd..c4f0e0e 100644 --- a/hasher-priv/hasher-priv.spec +++ b/hasher-priv/hasher-priv.spec @@ -33,7 +33,9 @@ required by hasher utilities. %make_build CC="%__cc" CFLAGS="%optflags" libexecdir="%_libexecdir" %install -%makeinstall +%makeinstall \ + systemd_unitdir="%{?buildroot:%{buildroot}}%_unitdir" \ + # %pre if getent group pkg-build > /dev/null; then @@ -52,10 +54,15 @@ groupadd -r -f hashman %attr(750,root,hashman) %dir %configdir/user.d %attr(640,root,hashman) %config(noreplace) %configdir/fstab %attr(640,root,hashman) %config(noreplace) %configdir/system +%attr(640,root,hashman) %config(noreplace) %configdir/server # helpers %attr(750,root,hashman) %dir %helperdir %attr(6710,root,hashman) %helperdir/%name %attr(755,root,root) %helperdir/*.sh +# daemon +%_sbindir/hasher-privd +%_unitdir/hasher-privd.service +%_initdir/hasher-privd %doc DESIGN diff --git a/hasher-priv/hasher-privd.service b/hasher-priv/hasher-privd.service new file mode 100644 index 0000000..f44faa0 --- /dev/null +++ b/hasher-priv/hasher-privd.service @@ -0,0 +1,14 @@ +[Unit] +Description=A privileged helper for the hasher project +ConditionVirtualization=!container +Documentation=man:hasher-priv(8) + +[Service] +ExecStart=/usr/sbin/hasher-privd -f +Group=hashman +RuntimeDirectory=hasher-priv +RuntimeDirectoryMode=0710 +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/hasher-priv/hasher-privd.sysvinit b/hasher-priv/hasher-privd.sysvinit new file mode 100755 index 0000000..263c9f7 --- /dev/null +++ b/hasher-priv/hasher-privd.sysvinit @@ -0,0 +1,103 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Short-Description: A privileged helper for the hasher project +# Description: A privileged helper for the hasher project +# Provides: hasher-priv +# Required-Start: $remote_fs +# Required-Stop: $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +WITHOUT_RC_COMPAT=1 + +# Source function library. +. /etc/init.d/functions + +NAME=hasher-privd +PIDFILE="/var/run/$NAME.pid" +LOCKFILE="/var/lock/subsys/$NAME" +RUNTIMEDIR="/run/hasher-priv" +RUNTIMEDIRMODE="0710" +GROUP=hashman +RETVAL=0 + +ensure_runtime_directory() +{ + mkdir -p "$RUNTIMEDIR" + chmod 0710 "$RUNTIMEDIR" + chgrp "$GROUP" "$RUNTIMEDIR" +} + +ensure_no_runtime_directory() +{ + rm -rf "$RUNTIMEDIR" +} + +start() +{ + start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" -- "$NAME" + RETVAL=$? + return $RETVAL +} + +stop() +{ + stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" "$NAME" + RETVAL=$? + return $RETVAL +} + +restart() +{ + stop + start +} + +# See how we were called. +case "$1" in + start) + ensure_runtime_directory + start + ;; + stop) + stop + ensure_no_runtime_directory + ;; + status) + status --pidfile "$PIDFILE" "$NAME" + RETVAL=$? + ;; + restart) + restart + ;; + reload) + restart + ;; + condstart) + if [ ! -e "$LOCKFILE" ]; then + start + fi + ;; + condstop) + if [ -e "$LOCKFILE" ]; then + stop + fi + ;; + condrestart) + if [ -e "$LOCKFILE" ]; then + restart + fi + ;; + condreload) + if [ -e "$LOCKFILE" ]; then + reload + fi + ;; + *) + msg_usage "${0##*/} {start|stop|status|restart|reload|condstart|condstop|condrestart|condreload}" + RETVAL=1 +esac + +exit $RETVAL -- 2.25.4