From patchwork Thu Oct 15 10:11:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nosthoff X-Patchwork-Id: 1382556 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=busybox.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=heine.tech header.i=@heine.tech header.a=rsa-sha256 header.s=dkim header.b=l3cgtaSH; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CBlSb66gQz9sSf for ; Thu, 15 Oct 2020 21:11:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C66B8854D; Thu, 15 Oct 2020 10:11:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FrHaIuqtngtU; Thu, 15 Oct 2020 10:11:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E763D88549; Thu, 15 Oct 2020 10:11:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3E90C1BF309 for ; Thu, 15 Oct 2020 10:11:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 345962E61A for ; Thu, 15 Oct 2020 10:11:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ytmfdXMy9g9X for ; Thu, 15 Oct 2020 10:11:51 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.heine.tech (mail.heine.tech [195.201.24.99]) by silver.osuosl.org (Postfix) with ESMTPS id 620762044F for ; Thu, 15 Oct 2020 10:11:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E40AE18150D; Thu, 15 Oct 2020 12:11:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heine.tech; s=dkim; t=1602756707; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding; bh=lv2WwYFYpWSRCSvAZWFCTZ86Udg6PAL94T4TTBA80S8=; b=l3cgtaSHJuGtOxHPxK4dStgfkGFP5x0FssmjZhq0gXFkZqkzoQ8G7P5wcfhleofnWEGHMq x1rXTM2twmXpJqHoIW5G2ZIh8cUdw6SrNyt1KaMaFY9sH+mPk5eCW+0xJHB5FM/TiAScJW 5/jZoPLkLqcHgKq2mvFvJbnBL+8ZjdU= To: buildroot@buildroot.org Date: Thu, 15 Oct 2020 12:11:36 +0200 Message-Id: <20201015101137.32333-1-buildroot@heine.tech> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Subject: [Buildroot] [PATCH] package/nginx: use /run instead of /var/run X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Michael Nosthoff via buildroot Reply-To: Michael Nosthoff Cc: Michael Nosthoff , Samuel Martin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This is a follow-up to 4027ba29f448 ("package/nginx: use /run for PIDFile"). I missed that nginx is still built with /var/run paths. This commit changes the compile options to use /run instead of /var/run for pid and lock file to make it consistent. Further dropping the passing of the pid option in the service file as this isn't neccessary. Neither debian nor nginx default .service does it. Signed-off-by: Michael Nosthoff --- package/nginx/nginx.mk | 4 ++-- package/nginx/nginx.service | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 1f896bc377..00fb147682 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -49,8 +49,8 @@ NGINX_CONF_OPTS += \ --prefix=/usr \ --conf-path=/etc/nginx/nginx.conf \ --sbin-path=/usr/sbin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/run/lock/nginx.lock \ + --pid-path=/run/nginx.pid \ + --lock-path=/run/lock/nginx.lock \ --user=www-data \ --group=www-data \ --error-log-path=/var/log/nginx/error.log \ diff --git a/package/nginx/nginx.service b/package/nginx/nginx.service index 9fd215fd3e..f203cecdc0 100644 --- a/package/nginx/nginx.service +++ b/package/nginx/nginx.service @@ -6,10 +6,10 @@ After=syslog.target network.target Type=forking PIDFile=/run/nginx.pid ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit +ExecStartPre=/usr/sbin/nginx -t -q -g 'daemon on; master_process on;' +ExecStart=/usr/sbin/nginx -g 'daemon on; master_process on;' +ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload +ExecStop=/usr/sbin/nginx -s quit PrivateDevices=yes [Install]