From patchwork Mon Jul 22 15:54:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 18517 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5715325E1F for ; Mon, 22 Jul 2013 15:54:27 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id 5sf2162501qeb.6 for ; Mon, 22 Jul 2013 08:54:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=qXV2pu8vXWmjkDPiL6PwrxbPZ03EaLzGZYXC3J4pwo4=; b=CBji7nZ9/8RML7k/RqsJhAu9A2IKqnT8IRGh2IOjlZFpbzfTKfS/ll1C8+OINclxic 6B/Nd8YSnqpJsT0JmGqbcgG51PesAZ/4l1JJ1JlVOY4Kdg/t+2M471sv6xg+SDZLeWSl 8L5kPwS5Sf6xsP+Mt7gGYT3zu2A+B2RJoVhyCOzNc8Nx/7TAkE21J1/s6OgkzPGs9xBf r6APnH9w/GnO4ug40AOLP/7PgZmOs5ecSFibd3TtIC0Ez09IRuLH8nI2GXduTcMoSJD+ H1jZINexd4qOgfKdUNRrWJQbY3G7o4z9Df4EIDA3xxhjv2jLM7HTh2/b1ioT2SkUU2rz 3l/Q== X-Received: by 10.236.135.66 with SMTP id t42mr16114382yhi.36.1374508466416; Mon, 22 Jul 2013 08:54:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.66 with SMTP id 2ls2594678qec.47.gmail; Mon, 22 Jul 2013 08:54:26 -0700 (PDT) X-Received: by 10.52.249.9 with SMTP id yq9mr8164631vdc.93.1374508466206; Mon, 22 Jul 2013 08:54:26 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id r5si7136797vcr.139.2013.07.22.08.54.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Jul 2013 08:54:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id da11so5115748veb.20 for ; Mon, 22 Jul 2013 08:54:26 -0700 (PDT) X-Received: by 10.58.251.144 with SMTP id zk16mr9232970vec.37.1374508466040; Mon, 22 Jul 2013 08:54:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp61738veb; Mon, 22 Jul 2013 08:54:25 -0700 (PDT) X-Received: by 10.194.234.100 with SMTP id ud4mr20032978wjc.44.1374508464758; Mon, 22 Jul 2013 08:54:24 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id q20si11216102wik.49.2013.07.22.08.54.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 22 Jul 2013 08:54:24 -0700 (PDT) Received-SPF: neutral (google.com: 92.243.29.197 is neither permitted nor denied by best guess record for domain of riku.voipio@linaro.org) client-ip=92.243.29.197; Received: from aimless.elisa-laajakaista.fi (a91-156-63-85.elisa-laajakaista.fi [91.156.63.85]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 8C6CD26545; Mon, 22 Jul 2013 17:54:22 +0200 (CEST) From: Riku Voipio To: patches@linaro.org Cc: Riku Voipio Subject: [meta-webserver][PATCH] apache2: move pidfile to run Date: Mon, 22 Jul 2013 18:54:19 +0300 Message-Id: <1374508459-17242-1-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Gm-Message-State: ALoCoQkHgAZpa/bu2UVwejHX2Ot2tErTBxqJkN8RzFTspsY91Hdcj9Y1S3CUNrtWvFSVYijr24Il X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , pidile was stored in /var/apache2/log which is saved over boots. This might prevent startup of apache2 on boots. Move it to /run where pidfiles in general belong. --- meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb | 2 ++ meta-webserver/recipes-httpd/apache2/files/init | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb index cf1e469..8c9416a 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb @@ -68,6 +68,8 @@ do_install_append() { # Ensure configuration file pulls in conf.d and modules.d printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + # match with that is in init script + printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf } SYSROOT_PREPROCESS_FUNCS += "apache_sysroot_preprocess" diff --git a/meta-webserver/recipes-httpd/apache2/files/init b/meta-webserver/recipes-httpd/apache2/files/init index 346dc0d..a1adbd7 100755 --- a/meta-webserver/recipes-httpd/apache2/files/init +++ b/meta-webserver/recipes-httpd/apache2/files/init @@ -14,7 +14,7 @@ NAME=apache2 PATH=/bin:/usr/bin:/sbin:/usr/sbin DAEMON=/usr/sbin/httpd SUEXEC=/usr/lib/apache/suexec -PIDFILE=/var/apache2/logs/httpd.pid +PIDFILE=/run/httpd.pid CONF=/etc/apache2/httpd.conf APACHECTL=/usr/sbin/apachectl