From patchwork Mon Jun 25 14:31:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 167127 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id C0B72B6F13 for ; Tue, 26 Jun 2012 00:33:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4F01B28EE6; Mon, 25 Jun 2012 14:33:06 +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 j3JyM07hohFA; Mon, 25 Jun 2012 14:33:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5A57B26B29; Mon, 25 Jun 2012 14:33:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 167BE8F75B for ; Mon, 25 Jun 2012 14:33:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EFF39879CA for ; Mon, 25 Jun 2012 14:33:02 +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 9iJJaEIueRoa for ; Mon, 25 Jun 2012 14:32:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id AC4CA89DBA for ; Mon, 25 Jun 2012 14:31:50 +0000 (UTC) Received: by eeke50 with SMTP id e50so2161016eek.16 for ; Mon, 25 Jun 2012 07:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=+wFXPokdpd4pdp/2dWXi9VXhFsmtL5lxy6zwhFR0U8M=; b=bBIbOg8fFBt2sDpz5l+aBFdLRL/Mouw0Zkl6iixOa+JKVXPjxFnxLhf4W+0L4kBu1L Gg3HSqjq2OuiMiqylEwT1oEmiZbqnPun/hpEVwL1h5D4bkTyYUmRg3RXvY0dE0JGn2SI aedqO30IDoIj6hlmcLrjUVqwltYikGgrDigxaew5RvnHggo3xbXzF06FkIalgZTVyqbd GRBI5kFL58d6mhquPLkHgDGPr5GzAqQtPz43JhMmW3+ei5IQ2LFk/KKFh+qOTwPessW0 jjANhi6BIXtHWsi3LSa2l99LwRPsSkkpg7gCJYT9gsDtUCGJBUS2ogPm28TOm4fnwBob c0WQ== Received: by 10.14.127.202 with SMTP id d50mr2362582eei.193.1340634708862; Mon, 25 Jun 2012 07:31:48 -0700 (PDT) Received: from percy.train.local ([213.170.149.177]) by mx.google.com with ESMTPS id t3sm139379031eeb.15.2012.06.25.07.31.46 (version=SSLv3 cipher=OTHER); Mon, 25 Jun 2012 07:31:47 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Mon, 25 Jun 2012 15:31:45 +0100 Message-Id: <1340634705-20022-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] lighttpd: use standard web root directory X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Simon Dawson The lighttpd package uses /srv/www as its web root directory; this sets it apart from other web-related packages in Buildroot, which all use /var/www as their web root directory. Signed-off-by: Simon Dawson --- .../lighttpd-Fix-default-config-file.patch | 52 +++++++++----------- package/lighttpd/lighttpd.mk | 2 +- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/package/lighttpd/lighttpd-Fix-default-config-file.patch b/package/lighttpd/lighttpd-Fix-default-config-file.patch index 59ce907..d7900e9 100644 --- a/package/lighttpd/lighttpd-Fix-default-config-file.patch +++ b/package/lighttpd/lighttpd-Fix-default-config-file.patch @@ -8,25 +8,34 @@ Modify the default lighttpd configuration file to have one a starting conf * Change the network backend to writev since linux-sendfile fails on buildroot Signed-off-by: Maxime Ripard ---- - doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 18 +++++++++--------- - 2 files changed, 10 insertions(+), 10 deletions(-) -Index: lighttpd-1.4.30/doc/config/lighttpd.conf -=================================================================== ---- lighttpd-1.4.30.orig/doc/config/lighttpd.conf -+++ lighttpd-1.4.30/doc/config/lighttpd.conf -@@ -13,7 +13,7 @@ +diff -Nurp a/doc/config/conf.d/access_log.conf b/doc/config/conf.d/access_log.conf +--- a/doc/config/conf.d/access_log.conf 2010-07-11 18:01:32.000000000 +0100 ++++ b/doc/config/conf.d/access_log.conf 2012-06-25 15:20:29.053260085 +0100 +@@ -9,7 +9,7 @@ server.modules += ( "mod_accesslog" ) + ## + ## Default access log. + ## +-accesslog.filename = log_root + "/access.log" ++accesslog.filename = log_root + "/lighttpd-access.log" + + ## + ## The default format produces CLF compatible output. +diff -Nurp a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf +--- a/doc/config/lighttpd.conf 2011-12-18 12:57:25.000000000 +0000 ++++ b/doc/config/lighttpd.conf 2012-06-25 15:21:49.469256500 +0100 +@@ -13,8 +13,8 @@ ## if you add a variable here. Add the corresponding variable in the ## chroot example aswell. ## -var.log_root = "/var/log/lighttpd" +-var.server_root = "/srv/www" +var.log_root = "/var/log" - var.server_root = "/srv/www" ++var.server_root = "/var/www" var.state_dir = "/var/run" var.home_dir = "/var/lib/lighttpd" -@@ -90,7 +90,7 @@ + var.conf_dir = "/etc/lighttpd" +@@ -90,7 +90,7 @@ server.port = 80 ## ## Use IPv6? ## @@ -35,7 +44,7 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf ## ## bind to a specific IP -@@ -101,8 +101,8 @@ +@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -46,7 +55,7 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf ## ## enable core files. -@@ -138,7 +138,7 @@ +@@ -138,7 +138,7 @@ server.pid-file = state_dir + "/lighttpd ## ## Path to the error log file ## @@ -55,7 +64,7 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf ## ## If you want to log to syslog you have to unset the -@@ -188,7 +188,7 @@ +@@ -188,7 +188,7 @@ server.event-handler = "linux-sysepoll" ## linux-sendfile - is recommended for small files. ## writev - is recommended for sending many large files ## @@ -64,7 +73,7 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf ## ## As lighttpd is a single-threaded server, its main resource limit is -@@ -311,9 +311,9 @@ +@@ -311,9 +311,9 @@ url.access-deny = ( "~", ".i ## disable range requests for pdf files ## workaround for a bug in the Acrobat Reader plugin. ## @@ -77,16 +86,3 @@ Index: lighttpd-1.4.30/doc/config/lighttpd.conf ## ## url handling modules (rewrite, redirect) -Index: lighttpd-1.4.30/doc/config/conf.d/access_log.conf -=================================================================== ---- lighttpd-1.4.30.orig/doc/config/conf.d/access_log.conf -+++ lighttpd-1.4.30/doc/config/conf.d/access_log.conf -@@ -9,7 +9,7 @@ - ## - ## Default access log. - ## --accesslog.filename = log_root + "/access.log" -+accesslog.filename = log_root + "/lighttpd-access.log" - - ## - ## The default format produces CLF compatible output. diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index c7fae32..0b75185 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -59,7 +59,7 @@ endif define LIGHTTPD_INSTALL_CONFIG mkdir -p $(TARGET_DIR)/etc/lighttpd mkdir -p $(TARGET_DIR)/etc/lighttpd/conf.d - mkdir -p $(TARGET_DIR)/srv/www/htdocs + mkdir -p $(TARGET_DIR)/var/www/htdocs [ -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ] || \ $(INSTALL) -D -m 755 $(@D)/doc/config/lighttpd.conf \