bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apache: Updated to 2.2.6, and moved the config files into /etc/apache as per discussion with nbd.

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@8902 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
rwhitby 2007-09-21 04:25:06 +00:00
parent 460c340c30
commit 03a88de29d
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/apache/Makefile
View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=apache
PKG_VERSION:=2.2.4
PKG_VERSION:=2.2.6
PKG_RELEASE:=1
PKG_SOURCE_NAME:=httpd
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/
PKG_MD5SUM:=3add41e0b924d4bb53c2dee55a38c09e
PKG_MD5SUM:=d050a49bd7532ec21c6bb593b3473a5d
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
@ -118,9 +118,9 @@ define Package/apache-server/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/httpd.exp $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/share
$(CP) $(PKG_INSTALL_DIR)/usr/share/{error,htdocs,cgi-bin,build} $(1)/usr/share/
$(INSTALL_DIR) $(1)/etc
$(CP) $(PKG_INSTALL_DIR)/etc/{magic,mime.types,extra} $(1)/etc/
$(CP) ./files/etc/httpd.conf $(1)/etc/
$(INSTALL_DIR) $(1)/etc/apache
$(CP) $(PKG_INSTALL_DIR)/etc/{magic,mime.types,extra} $(1)/etc/apache/
$(CP) ./files/etc/apache/httpd.conf $(1)/etc/apache/
endef
define Package/apache-server/postrm

28
net/apache/files/etc/httpd.conf → net/apache/files/etc/apache/httpd.conf
View File

@ -284,7 +284,7 @@ DefaultType text/plain
# TypesConfig points to the file containing the list of mappings from
# filename extension to MIME-type.
#
TypesConfig /etc/mime.types
TypesConfig /etc/apache/mime.types
#
# AddType allows you to add to or override the MIME configuration
@ -332,7 +332,7 @@ DefaultType text/plain
# contents of the file itself to determine its type. The MIMEMagicFile
# directive tells the module where the hint definitions are located.
#
MIMEMagicFile /etc/magic
MIMEMagicFile /etc/apache/magic
#
# Customizable error responses come in three flavors:
@ -358,43 +358,43 @@ EnableSendfile off
# Supplemental configuration
#
# The configuration files in the /etc/extra/ directory can be
# The configuration files in the /etc/apache/extra/ directory can be
# included to add extra features or to modify the default configuration of
# the server, or you may simply copy their contents here and change as
# necessary.
# Server-pool management (MPM specific)
## Include /etc/extra/httpd-mpm.conf
## Include /etc/apache/extra/httpd-mpm.conf
# Multi-language error messages
## Include /etc/extra/httpd-multilang-errordoc.conf
## Include /etc/apache/extra/httpd-multilang-errordoc.conf
# Fancy directory listings
## Include /etc/extra/httpd-autoindex.conf
## Include /etc/apache/extra/httpd-autoindex.conf
# Language settings
## Include /etc/extra/httpd-languages.conf
## Include /etc/apache/extra/httpd-languages.conf
# User home directories
## Include /etc/extra/httpd-userdir.conf
## Include /etc/apache/extra/httpd-userdir.conf
# Real-time info on requests and configuration
## Include /etc/extra/httpd-info.conf
## Include /etc/apache/extra/httpd-info.conf
# Virtual hosts
## Include /etc/extra/httpd-vhosts.conf
## Include /etc/apache/extra/httpd-vhosts.conf
# Local access to the Apache HTTP Server Manual
## Include /etc/extra/httpd-manual.conf
## Include /etc/apache/extra/httpd-manual.conf
# Distributed authoring and versioning (WebDAV)
## Include /etc/extra/httpd-dav.conf
## Include /etc/apache/extra/httpd-dav.conf
# Various default settings
## Include /etc/extra/httpd-default.conf
## Include /etc/apache/extra/httpd-default.conf
# Secure (SSL/TLS) connections
## Include /etc/extra/httpd-ssl.conf
## Include /etc/apache/extra/httpd-ssl.conf
#
# Note: The following must must be present to support
# starting without SSL on platforms with no /dev/random equivalent