From 39b6305878b5981679d7efd8225a901b624a40b6 Mon Sep 17 00:00:00 2001 From: Henry Gebhardt Date: Sat, 27 Apr 2013 11:23:32 -0400 Subject: sys-apps/systemd-units-10: remove lighttpd.servce, included upstream --- .../files/services-server/lighttpd.service | 37 --------------- sys-apps/systemd-units/systemd-units-10.ebuild | 53 ++++++++++++++++++++++ sys-apps/systemd-units/systemd-units-9.ebuild | 53 ---------------------- 3 files changed, 53 insertions(+), 90 deletions(-) delete mode 100644 sys-apps/systemd-units/files/services-server/lighttpd.service create mode 100644 sys-apps/systemd-units/systemd-units-10.ebuild delete mode 100644 sys-apps/systemd-units/systemd-units-9.ebuild diff --git a/sys-apps/systemd-units/files/services-server/lighttpd.service b/sys-apps/systemd-units/files/services-server/lighttpd.service deleted file mode 100644 index d420dfb..0000000 --- a/sys-apps/systemd-units/files/services-server/lighttpd.service +++ /dev/null @@ -1,37 +0,0 @@ -[Unit] -Description=Lighttpd Web Server -After=network.target - -[Service] -# Lighttpd has a broken PID file handling scheme. -# The PID file is written by the child, and this fools systemd's detection -# of the main PID. So we run lighttpd as a foreground process. -ExecStart=/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf -D - -# Lighttpd does not support graceful reloading in a sane way, that's why -# you can't reload this service. SIGHUP is for reopening log files, not for -# reloading configuration. -# -# Here is the procedure proposed upstream: -# http://blog.lighttpd.net/articles/2005/09/02/graceful-restart -# However, an attempt to implement it triggers an assertion in systemd-16: -# http://lists.freedesktop.org/archives/systemd-devel/2011-January/001055.html -# Even after removing the wrong assertion, it requires systemd to notice -# that the main PID changed. Systemd developers agreed that it is invalid to -# change the main PID while reloading the service. -# -# Anyway, the proposed scheme doesn't make sense even for a traditional -# SysV init: while both the old and the new inscances of lighttpd -# coexist, it is impossible to forcefully terminate them all without -# using killall, as the PID of the old instance is not stored in any -# file. - -# Configuration testing (/usr/sbin/lighttpd -t -f -# /etc/lighttpd/lighttpd.conf) is not supported by systemd-16 in a -# meaningful way (it is impossible to block attempts to start, restart -# or reload the service with a bad config). That's why this lighttpd -# feature is not used. - -[Install] -WantedBy=multi-user.target -WantedBy=http-daemon.target diff --git a/sys-apps/systemd-units/systemd-units-10.ebuild b/sys-apps/systemd-units/systemd-units-10.ebuild new file mode 100644 index 0000000..0ef9f2d --- /dev/null +++ b/sys-apps/systemd-units/systemd-units-10.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 +inherit eutils systemd + +DESCRIPTION="Service files for sys-apps/systemd" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd http://en.gentoo-wiki.com/wiki/Systemd" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+basic +desktop server ingnome3" + +RDEPEND="" +DEPEND="" + +src_install() { + if use basic; then + systemd_dounit "${FILESDIR}"/services-basic/* + fi + + if use server; then + systemd_dounit "${FILESDIR}"/services-server/* + systemd_dotmpfilesd "${FILESDIR}"/tmpfiles-server/* + ( + insinto /etc/kernel/postinst.d/ + doins "${FILESDIR}"/90_kexec + ) + fi + + if use desktop; then + systemd_dounit "${FILESDIR}"/services-desktop/* + + if ! use ingnome3; then + rm -f "${D}/$(systemd_get_unitdir)"/gdm.service + fi + fi + + # Files in portage cannot contain a literal '@' character. Therfore, + # convert the code string "_at" into an '@' before installing. + rename '_at' '@' "${D}/$(systemd_get_unitdir)"/* +} + +pkg_postinst() { + if use server; then + elog "The file '${ROOT}etc/kernel/postinst.d/90_kexec' has been" + elog "installed for you. If you use kexec, you may want to enable it by" + elog "making it exectuable." + fi +} diff --git a/sys-apps/systemd-units/systemd-units-9.ebuild b/sys-apps/systemd-units/systemd-units-9.ebuild deleted file mode 100644 index 0ef9f2d..0000000 --- a/sys-apps/systemd-units/systemd-units-9.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -inherit eutils systemd - -DESCRIPTION="Service files for sys-apps/systemd" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd http://en.gentoo-wiki.com/wiki/Systemd" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+basic +desktop server ingnome3" - -RDEPEND="" -DEPEND="" - -src_install() { - if use basic; then - systemd_dounit "${FILESDIR}"/services-basic/* - fi - - if use server; then - systemd_dounit "${FILESDIR}"/services-server/* - systemd_dotmpfilesd "${FILESDIR}"/tmpfiles-server/* - ( - insinto /etc/kernel/postinst.d/ - doins "${FILESDIR}"/90_kexec - ) - fi - - if use desktop; then - systemd_dounit "${FILESDIR}"/services-desktop/* - - if ! use ingnome3; then - rm -f "${D}/$(systemd_get_unitdir)"/gdm.service - fi - fi - - # Files in portage cannot contain a literal '@' character. Therfore, - # convert the code string "_at" into an '@' before installing. - rename '_at' '@' "${D}/$(systemd_get_unitdir)"/* -} - -pkg_postinst() { - if use server; then - elog "The file '${ROOT}etc/kernel/postinst.d/90_kexec' has been" - elog "installed for you. If you use kexec, you may want to enable it by" - elog "making it exectuable." - fi -} -- cgit v1.2.3-65-gdbad