From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 042271382C5 for ; Fri, 12 Feb 2021 14:28:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31B86E0A44; Fri, 12 Feb 2021 14:28:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AD4BE0A44 for ; Fri, 12 Feb 2021 14:28:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC147340D49 for ; Fri, 12 Feb 2021 14:28:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A2374AF for ; Fri, 12 Feb 2021 14:28:50 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1613139982.64371485b30887df6097de53f106803ecc746dae.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:master commit in: 2.4/scripts/ X-VCS-Repository: proj/apache X-VCS-Files: 2.4/scripts/apache2-logrotate X-VCS-Directories: 2.4/scripts/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 64371485b30887df6097de53f106803ecc746dae X-VCS-Branch: master Date: Fri, 12 Feb 2021 14:28:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 52e3e061-3496-4386-a43a-b1d6dfa15672 X-Archives-Hash: 05ab5cb24b00ed54bf8f647195b6c09d commit: 64371485b30887df6097de53f106803ecc746dae Author: Pacho Ramos gmail com> AuthorDate: Fri Feb 12 14:09:08 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Feb 12 14:26:22 2021 +0000 URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=64371485 2.4/scripts/apache2-logrotate: handle systemd Bug: https://bugs.gentoo.org/646032 Signed-off-by: Pacho Ramos gentoo.org> Signed-off-by: Lars Wendler gentoo.org> 2.4/scripts/apache2-logrotate | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/2.4/scripts/apache2-logrotate b/2.4/scripts/apache2-logrotate index 9dd431c..5d9f8dc 100644 --- a/2.4/scripts/apache2-logrotate +++ b/2.4/scripts/apache2-logrotate @@ -1,11 +1,15 @@ # Apache2 logrotate snipet for Gentoo Linux -# Contributes by Chuck Short +# Originally contributed by Chuck Short # /var/log/apache2/*log { missingok notifempty sharedscripts postrotate - /etc/init.d/apache2 reload > /dev/null 2>&1 || true + if test -d /run/systemd/system ; then + systemctl reload apache2.service > /dev/null 2>&1 || true + else + /etc/init.d/apache2 reload > /dev/null 2>&1 || true + fi endscript }