Changeset 8902


Ignore:
Timestamp:
2007-09-21T06:25:06+02:00 (10 years ago)
Author:
rwhitby
Message:

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

Location:
packages/net/apache
Files:
1 added
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • packages/net/apache/Makefile

    r8010 r8902  
    1010 
    1111PKG_NAME:=apache 
    12 PKG_VERSION:=2.2.4 
     12PKG_VERSION:=2.2.6 
    1313PKG_RELEASE:=1 
    1414PKG_SOURCE_NAME:=httpd 
     
    1616PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz 
    1717PKG_SOURCE_URL:=http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/ 
    18 PKG_MD5SUM:=3add41e0b924d4bb53c2dee55a38c09e 
     18PKG_MD5SUM:=d050a49bd7532ec21c6bb593b3473a5d 
    1919PKG_CAT:=zcat 
    2020 
     
    119119        $(INSTALL_DIR) $(1)/usr/share 
    120120        $(CP) $(PKG_INSTALL_DIR)/usr/share/{error,htdocs,cgi-bin,build} $(1)/usr/share/ 
    121         $(INSTALL_DIR) $(1)/etc 
    122         $(CP) $(PKG_INSTALL_DIR)/etc/{magic,mime.types,extra} $(1)/etc/ 
    123         $(CP) ./files/etc/httpd.conf $(1)/etc/ 
     121        $(INSTALL_DIR) $(1)/etc/apache 
     122        $(CP) $(PKG_INSTALL_DIR)/etc/{magic,mime.types,extra} $(1)/etc/apache/ 
     123        $(CP) ./files/etc/apache/httpd.conf $(1)/etc/apache/ 
    124124endef 
    125125 
  • packages/net/apache/files/etc/apache/httpd.conf

    r8851 r8902  
    285285    # filename extension to MIME-type. 
    286286    # 
    287     TypesConfig /etc/mime.types 
     287    TypesConfig /etc/apache/mime.types 
    288288 
    289289    # 
     
    333333# directive tells the module where the hint definitions are located. 
    334334# 
    335 MIMEMagicFile /etc/magic 
     335MIMEMagicFile /etc/apache/magic 
    336336 
    337337# 
     
    359359# Supplemental configuration 
    360360# 
    361 # The configuration files in the /etc/extra/ directory can be  
     361# The configuration files in the /etc/apache/extra/ directory can be  
    362362# included to add extra features or to modify the default configuration of  
    363363# the server, or you may simply copy their contents here and change as  
     
    365365 
    366366# Server-pool management (MPM specific) 
    367 ## Include /etc/extra/httpd-mpm.conf 
     367## Include /etc/apache/extra/httpd-mpm.conf 
    368368 
    369369# Multi-language error messages 
    370 ## Include /etc/extra/httpd-multilang-errordoc.conf 
     370## Include /etc/apache/extra/httpd-multilang-errordoc.conf 
    371371 
    372372# Fancy directory listings 
    373 ## Include /etc/extra/httpd-autoindex.conf 
     373## Include /etc/apache/extra/httpd-autoindex.conf 
    374374 
    375375# Language settings 
    376 ## Include /etc/extra/httpd-languages.conf 
     376## Include /etc/apache/extra/httpd-languages.conf 
    377377 
    378378# User home directories 
    379 ## Include /etc/extra/httpd-userdir.conf 
     379## Include /etc/apache/extra/httpd-userdir.conf 
    380380 
    381381# Real-time info on requests and configuration 
    382 ## Include /etc/extra/httpd-info.conf 
     382## Include /etc/apache/extra/httpd-info.conf 
    383383 
    384384# Virtual hosts 
    385 ## Include /etc/extra/httpd-vhosts.conf 
     385## Include /etc/apache/extra/httpd-vhosts.conf 
    386386 
    387387# Local access to the Apache HTTP Server Manual 
    388 ## Include /etc/extra/httpd-manual.conf 
     388## Include /etc/apache/extra/httpd-manual.conf 
    389389 
    390390# Distributed authoring and versioning (WebDAV) 
    391 ## Include /etc/extra/httpd-dav.conf 
     391## Include /etc/apache/extra/httpd-dav.conf 
    392392 
    393393# Various default settings 
    394 ## Include /etc/extra/httpd-default.conf 
     394## Include /etc/apache/extra/httpd-default.conf 
    395395 
    396396# Secure (SSL/TLS) connections 
    397 ## Include /etc/extra/httpd-ssl.conf 
     397## Include /etc/apache/extra/httpd-ssl.conf 
    398398# 
    399399# Note: The following must must be present to support 
Note: See TracChangeset for help on using the changeset viewer.