From patchwork Mon Jan 20 09:16:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal de Bruijn X-Patchwork-Id: 1225807 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=unilogic.nl Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=unilogicnl.onmicrosoft.com header.i=@unilogicnl.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-unilogicnl-onmicrosoft-com header.b=POs3ldJ9; 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 481RjC4t6hz9sRG for ; Mon, 20 Jan 2020 20:49:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 19DDA84DDD; Mon, 20 Jan 2020 09:49:48 +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 0rzfkFoEHCcG; Mon, 20 Jan 2020 09:49:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 89A3684CF3; Mon, 20 Jan 2020 09:49:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1C14A1BF47D for ; Mon, 20 Jan 2020 09:49:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 13B5581496 for ; Mon, 20 Jan 2020 09:49:42 +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 mug7+CpLad2F for ; Mon, 20 Jan 2020 09:49:36 +0000 (UTC) X-Greylist: delayed 00:17:49 by SQLgrey-1.7.6 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150051.outbound.protection.outlook.com [40.107.15.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id 399A384D3B for ; Mon, 20 Jan 2020 09:49:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BXzXjFfEP5aCB9lmBfUy6bAGOFcmDrOfGazH87gUlf9Yp86PX163YB77QoBuvu0xGiAV83uraxNOT6oK5FSpB6elvGLeidpLEpJjzXedkhlrZyUTSbz6irV565Ri8XAdqWMhWD4MI1X3UqrqYIF4ji8X7IWXo+yTCvTjgS8ZrxLh8NzSoCdPXFwKnwNQ+XUDw/HaYb/b77+p3v9N5LnLAB/nSfaeC9b6aBnYSr+13aoo/ofqeXOmXppv0RvKXPdfk+V4fTAQoVCar0hzCYsiGo95uhw+h3f6Lrd0V4ZUXzkjlgmk3bMY3RPL0soK/4TcZARDOsYkPoTR596qHMxu8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=peCticKPqpi9UISbCQiiTKLbIBdlQ1wDV4f0eAwZgPE=; b=Qj6FxRa8JjeKW1VogKMJb5/H8AGY7XAYwjKGgJjagkYjD4B7R+/BA+T0PxN+Zh6s5CBV2UKuhzU3o/hSHYqSjySAfa9F592N/7W70Y7ZmNp62xbmuzDOoslE+FQCgWpmUccTE50Tgswgy58rr506gzDsrUkmqRoQS6sqUihg8WEIpazMXjEYvActUfCiS6X8HAtRsAmKxwVFmXMS6KMKLzsR6is9fMlNhtCBuJWt9GNI4lF32wyVnCb+jqvLKqC6jq0jnZDP6e7tt3hgKVALqYKZ38HEpJpRYpYVfptB6sPkxtqM6XMDh8hEGh/4YOAiHdmZCe1mxAJCnxYL8LdSNQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=unilogic.nl; dmarc=pass action=none header.from=unilogic.nl; dkim=pass header.d=unilogic.nl; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unilogicnl.onmicrosoft.com; s=selector1-unilogicnl-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=peCticKPqpi9UISbCQiiTKLbIBdlQ1wDV4f0eAwZgPE=; b=POs3ldJ9kIjpskhi4oQmfM7IsPQc+KuSDqFgujNWQ05ILQ8opBBWGUdFQ8xyNRpF+0I8/zPlfi3rmYw8n7XGremVEw6HPjuOv0ehBHGpiNNee5K7XO2/9sr7z/G+lSQU3XLmDxkf2jtN/8s1nKA7h8wcEs/FQiASCnYxv0d6fQQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=p.debruijn@unilogic.nl; Received: from HE1PR07MB3401.eurprd07.prod.outlook.com (10.170.247.28) by HE1PR07MB3100.eurprd07.prod.outlook.com (10.170.245.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2665.12; Mon, 20 Jan 2020 09:16:42 +0000 Received: from HE1PR07MB3401.eurprd07.prod.outlook.com ([fe80::fd96:e429:4dd:66ab]) by HE1PR07MB3401.eurprd07.prod.outlook.com ([fe80::fd96:e429:4dd:66ab%7]) with mapi id 15.20.2665.012; Mon, 20 Jan 2020 09:16:42 +0000 From: Pascal de Bruijn To: buildroot@busybox.net Date: Mon, 20 Jan 2020 10:16:33 +0100 Message-Id: <20200120091633.6062-1-p.debruijn@unilogic.nl> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: AM0PR05CA0082.eurprd05.prod.outlook.com (2603:10a6:208:136::22) To HE1PR07MB3401.eurprd07.prod.outlook.com (2603:10a6:7:2d::28) MIME-Version: 1.0 Received: from optiplex-pbrui.unilogic.local (62.133.193.10) by AM0PR05CA0082.eurprd05.prod.outlook.com (2603:10a6:208:136::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Mon, 20 Jan 2020 09:16:42 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [62.133.193.10] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c959173-e554-4d54-a27b-08d79d89769c X-MS-TrafficTypeDiagnostic: HE1PR07MB3100: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 0288CD37D9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(346002)(136003)(396003)(39830400003)(189003)(199004)(66556008)(66476007)(52116002)(66946007)(186003)(6486002)(26005)(86362001)(6506007)(16526019)(6916009)(6512007)(4326008)(8936002)(316002)(956004)(2616005)(107886003)(508600001)(5660300002)(36756003)(81166006)(1076003)(2906002)(8676002)(81156014)(6666004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR07MB3100; H:HE1PR07MB3401.eurprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: unilogic.nl does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w2xM91vZQx/eiPIj0hlIc2T7BDiBO0n5TP6cvMbmS4YFYh5BSMntr0dYVlv/IkwOrnDg6eNCPirP/7xAO+MHmgGnPKjZpTcnyK7zt939mwKjBShQPbpWSfZXrAXE374qCK2hjgYlQKkKDElQxgvBZoKAhl6hO2Sd6M1oxz8Co99Yi5r9H26X5J5va65LeNJzJkWxnvZgoWuaCj74nNu+ZmCMq3WoR64auO6j6BcYxh2tGKyvcp3ZYxX1bzr488R9DpoZdtH+U97CT4DL6iJmRDat8D3aYgTBIk4evMpnEZX/wVgxCX3kjfqbFZ96SBJU8hlwPgJUVxX1rs1TZ1/KziriIGeZnR1UHUilTJrA9eUOHqAxht4PzY2GZXlDQQPdq2hfM1nKv3ZQNdBCiyVrFugLw65S6Gh2r7VSLFke2cDAd/AtY8kfStdE5eM+Sckl X-MS-Exchange-AntiSpam-MessageData: k1bxp89lVBdrrR66Xg5qPwrEIhFU/tf7iU4/nK+IpSUfPUJyyTWX2mQBx2lY89mFlXPqDfFuVzyBfwX3BKkjy8RYr7he6njU6hS399ZiY3L6Eeitr0eJsH5Zxjda/38COupMdgJpurQd1OuaeX1kDA== X-OriginatorOrg: unilogic.nl X-MS-Exchange-CrossTenant-Network-Message-Id: 0c959173-e554-4d54-a27b-08d79d89769c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 09:16:42.3970 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 80e1d02e-cf3d-42a6-8024-091a212ef6af X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VabWMX6Vg4bpO7yraiwnTew6dmGTJBqI9AkwmQzKEmdodn4OzCW15VzbN6x5ZDYKuQ+6heFnMyDLeyr7IfsA2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB3100 Subject: [Buildroot] [PATCH 2/2] package/nginx: use StateDirectory 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: , Cc: Pascal de Bruijn Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" move http-client-body-temp-path http-proxy-temp-path http-fastcgi-temp-path http-scgi-temp-path http-uwsgi-temp-path from /var/tmp/nginx to /var/lib/nginx this allows the use of systemd constructs LogsDirectory=nginx StateDirectory=nginx to replace ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx as there isn't similar construct for /var/tmp as a sidenote, ubuntu also uses /var/lib/nginx Signed-off-by: Pascal de Bruijn --- package/nginx/S50nginx | 2 +- package/nginx/nginx.mk | 10 +++++----- package/nginx/nginx.service | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/nginx/S50nginx b/package/nginx/S50nginx index 964652b..db41099 100644 --- a/package/nginx/S50nginx +++ b/package/nginx/S50nginx @@ -9,7 +9,7 @@ PIDFILE=/var/run/nginx.pid case "$1" in start) echo "Starting nginx..." - mkdir -p /var/log/nginx /var/tmp/nginx + mkdir -p /var/log/nginx /var/lib/nginx start-stop-daemon -S -x "$NGINX" -p "$PIDFILE" ;; stop) diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 59fddbb..9a9dd94 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -56,11 +56,11 @@ NGINX_CONF_OPTS += \ --group=www-data \ --error-log-path=/var/log/nginx/error.log \ --http-log-path=/var/log/nginx/access.log \ - --http-client-body-temp-path=/var/tmp/nginx/client-body \ - --http-proxy-temp-path=/var/tmp/nginx/proxy \ - --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi \ - --http-scgi-temp-path=/var/tmp/nginx/scgi \ - --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi + --http-client-body-temp-path=/var/lib/nginx/client-body \ + --http-proxy-temp-path=/var/lib/nginx/proxy \ + --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \ + --http-scgi-temp-path=/var/lib/nginx/scgi \ + --http-uwsgi-temp-path=/var/lib/nginx/uwsgi NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \ diff --git a/package/nginx/nginx.service b/package/nginx/nginx.service index 320df9a..d2f5f38 100644 --- a/package/nginx/nginx.service +++ b/package/nginx/nginx.service @@ -4,8 +4,9 @@ After=syslog.target network.target [Service] Type=forking +LogsDirectory=nginx +StateDirectory=nginx PIDFile=/var/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