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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CD6A159C96 for ; Mon, 29 Jul 2024 21:54:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E35F12BC103; Mon, 29 Jul 2024 21:52:51 +0000 (UTC) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A95092BC0FC for ; Mon, 29 Jul 2024 21:52:51 +0000 (UTC) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a7ac469e4c4so779266766b.0 for ; Mon, 29 Jul 2024 14:52:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722289970; x=1722894770; darn=lists.gentoo.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XbmCsZmiNZrOSIttwhIA2vnITFAWoFqf742HvJ5mCrM=; b=EERMBTV4pe1YehR2DcJhyJ8Toi29B5TZldBNqktZBbHmvx8g4crfHDN6iWTDjKzIzA xniyWSI+NgwRSEVFPzHybkCNQGOXnlArYfP+Xh8NfEyLV85BeVgnRO48ceQsKGJEm/DQ +Igfmvc8tO/jVJqwGbocpOjQWa0BjV4P+GlQwSMKCA66zaL2gyFrxelVrihOjOX8AFWF AM4kmml/kc5ueExsLo1bgerBg5IFQsSHaWk9mpahArH0SlOt3XULudmkS76MhsUbXFTc IrXvZN6G2XbP+3u9GPCA9x7dtNZDiPRXNI8W2Fejn36BmFrCjJLmjmykY8yqCCMqrlEd lPiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722289970; x=1722894770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XbmCsZmiNZrOSIttwhIA2vnITFAWoFqf742HvJ5mCrM=; b=Uv/idm6kG76sRqlLKzwyKyr0vgxtcCA4KH50IxDTi5/r4C8NMRdWA2Cg61xTbFiSuZ ESNaG1B/YrzGTo6kEGrzwd7ftLfvrpBdb33rkxhtN5/iX3vFcAelEF7BZIKO9LzZjyBC qPSSj4I0G794r91dhKhw1pkHH+WMnX9hF8gmoHobHicApUHM1yrmVjHUtxyOovJw/LbV fA3mfxhOfhgW6Z/SYqLGeArLlSPD+XDwOW8FyQpt0ddxbDHmejU2NTFMqsp3h+BzGYgY xBE+wln6wKgWFY6SUGpPbc7gRtZaKuO9RxMqkS0gfc4NXMbhlwl4LmX/zORX3Wx6sEIh ed/A== X-Gm-Message-State: AOJu0YwknJrFWxLAys/RUeOAqhXwne6apVflaWQ7OKRIrgN5Z49tWrGC hNh46bAHCLfPrD9oFwZlk+MYlof+YfRMJk8T9atob23swWXvnVic1MhOJA== X-Google-Smtp-Source: AGHT+IHohcnfm+ba+VlPe7WKf32iLVQZrB8vHy4wW+x1QLJeNSZKfmBzGZpJVDulGJlm4zuoU97bYg== X-Received: by 2002:a17:907:a809:b0:a72:5967:b34 with SMTP id a640c23a62f3a-a7d859eadecmr5360766b.22.1722289970223; Mon, 29 Jul 2024 14:52:50 -0700 (PDT) Received: from localhost.localdomain ([62.244.50.57]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7acad9046fsm564748266b.147.2024.07.29.14.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 14:52:49 -0700 (PDT) From: Zurab Kvachadze To: gentoo-dev@lists.gentoo.org Cc: conikost@gentoo.org, Zurab Kvachadze Subject: [gentoo-dev] [RFC PATCH v2 06/20] www-servers/nginx: add nginx-r1.confd Date: Tue, 30 Jul 2024 00:52:22 +0300 Message-ID: <20240729215241.13243-7-zurabid2016@gmail.com> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240729215241.13243-1-zurabid2016@gmail.com> References: <20240729215241.13243-1-zurabid2016@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 19297195-d9fb-4f7d-a620-04e36190ae34 X-Archives-Hash: e6cbaee73b45f35e808372c34260ddd5 This is the first revision of NGINX .confd file. This removes the NGINX_PIDFILE configuration directive as it is now unconditionally set to /run/${RV_SVCNAME}.pid. Additionally, the NGINX_MAXWAITTIME variable has been added, which configures the maximum amount of time for the upgrade() function to wait for NGINX to start before producing an error. Signed-off-by: Zurab Kvachadze --- .../nginx/files/{nginx.confd => nginx-r1.confd} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) copy www-servers/nginx/files/{nginx.confd => nginx-r1.confd} (83%) diff --git a/www-servers/nginx/files/nginx.confd b/www-servers/nginx/files/nginx-r1.confd similarity index 83% copy from www-servers/nginx/files/nginx.confd copy to www-servers/nginx/files/nginx-r1.confd index f4b804375e92..35c0d102d432 100644 --- a/www-servers/nginx/files/nginx.confd +++ b/www-servers/nginx/files/nginx-r1.confd @@ -3,11 +3,6 @@ # Configuration file #NGINX_CONFIGFILE="/etc/nginx/nginx.conf" -# PID file -# If you should ever change this, remember to update -# "/etc/logrotate.d/nginx", too. -#NGINX_PIDFILE="/run/nginx.pid" - # User to run nginx as # If you should ever change this, make sure this user has # execution permission on any of your log directories @@ -30,3 +25,8 @@ # that the service will be terminated within a given time (60 + 5 seconds # per default) when you are stopping the service. #NGINX_TERMTIMEOUT="TERM/60/KILL/5" + +# For the 'upgrade' function, this defines the maximum amount of time (in +# seconds) the script should wait for the new NGINX binary to start before +# producing an error. +#NGINX_MAXWAITTIME="3" -- 2.44.2