[arch-commits] Commit in apache/trunk (7 files)
Pierre Schmitz
pierre at archlinux.org
Fri Jun 20 00:41:44 UTC 2008
Date: Thursday, June 19, 2008 @ 20:41:43
Author: pierre
Revision: 3117
upgpkg: apache 2.2.9-1
build apache the Arch way; removed custom configs and /home/httpd
Modified:
apache/trunk/PKGBUILD
apache/trunk/httpd
Deleted:
apache/trunk/apache.install
apache/trunk/httpd.conf
apache/trunk/httpd.conf.d
apache/trunk/index.html
apache/trunk/mod_ssl.txt
----------------+
PKGBUILD | 83 ++++-----
apache.install | 14 -
httpd | 6
httpd.conf | 481 -------------------------------------------------------
httpd.conf.d | 1
index.html | 107 ------------
mod_ssl.txt | 23 --
7 files changed, 46 insertions(+), 669 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-06-19 20:38:01 UTC (rev 3116)
+++ PKGBUILD 2008-06-20 00:41:43 UTC (rev 3117)
@@ -1,56 +1,59 @@
# $Id$
-# Maintainer: Pierre Schmitz <pierre at zeroflux.de>
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
pkgname=apache
-pkgver=2.2.8
-pkgrel=2
-pkgdesc="A high performance Unix-based HTTP server (with SSL)"
+pkgver=2.2.9
+pkgrel=1
+pkgdesc="A high performance Unix-based HTTP server"
arch=('i686' 'x86_64')
options=('!libtool')
url='http://www.apache.org/dist/httpd'
license=('APACHE')
-install=apache.install
-backup=(etc/httpd/conf/httpd.conf home/httpd/html/index.html
+backup=(etc/httpd/conf/httpd.conf
etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf)
-depends=('openssl>=0.9.8b' 'zlib' 'apr-util>=1.2.12' 'db>=4.6' 'pcre')
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
- httpd index.html mod_ssl.txt httpd.logrotate httpd.conf)
-md5sums=('76d2598a4797163d07cd50e5304aa7cd' '6016e08d7465fc1617db2f94f58eb31b'\
- 'e9b572e426f6b6a4b6458993c23689c7' '68725783a63014506218d5870cc099b4'\
- 'a13925eef67108cf22f6bd1b2b8decb1' '9bc1ece8bb40a78c1c75dba0cde3d83b')
+depends=('openssl>=0.9.8b' 'zlib' 'apr-util>=1.3.0' 'db>=4.6' 'pcre')
+source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2"
+ 'httpd.logrotate' 'httpd' 'arch.layout')
+md5sums=('3afa8137dc1999be695a20b62fdf032b'
+ 'a13925eef67108cf22f6bd1b2b8decb1'
+ 'fb6baeced65b7cf5b80083f278adebba'
+ '0816f63f1dc68f39e08d57fedd53b95e')
build() {
- cd ${startdir}/src/httpd-${pkgver}
+ cd ${srcdir}/httpd-${pkgver}
# fix the suexec user
sed -i 's|^#define AP_HTTPD_USER.*$|#define AP_HTTPD_USER "nobody"|' \
- support/suexec.h
- ./configure --prefix=/usr --enable-layout=RedHat --datadir=/home/httpd \
- --enable-modules=all --enable-mods-shared=all --enable-ssl --enable-so \
- --enable-proxy --enable-proxy-connect --enable-proxy-ftp \
- --enable-proxy-http --enable-suexec --enable-dbd \
- --enable-cache --enable-disk-cache --enable-mem-cache \
- --with-apr=/usr --with-apr-util=/usr --with-pcre=/usr
+ support/suexec.h || return 1i
+ sed -e 's#User daemon#User nobody#' \
+ -e 's#Group daemon#Group nobody#' \
+ -i docs/conf/httpd.conf.in || return 1
+
+ cat ${srcdir}/arch.layout >> config.layout
+ ./configure --enable-layout=Arch \
+ --enable-modules=all \
+ --enable-mods-shared=all \
+ --enable-ssl \
+ --enable-so \
+ --enable-proxy \
+ --enable-proxy-connect \
+ --enable-proxy-ftp \
+ --enable-proxy-http \
+ --enable-suexec \
+ --enable-dbd \
+ --enable-cache \
+ --enable-disk-cache \
+ --enable-mem-cache \
+ --with-apr=/usr \
+ --with-apr-util=/usr \
+ --with-pcre=/usr || return 1
+
make || return 1
- make DESTDIR=${startdir}/pkg install
- rm -f ${startdir}/pkg/usr/include/fnmatch.h
- rm -rf ${startdir}/pkg/home/httpd/html/* ${startdir}/pkg/home/httpd/manual
- install -D -m755 ../httpd ${startdir}/pkg/etc/rc.d/httpd
- install -D -m644 ../httpd.logrotate ${startdir}/pkg/etc/logrotate.d/httpd
- install -D -m644 ../index.html ${startdir}/pkg/home/httpd/html/index.html
- install -D -m644 ../mod_ssl.txt ${startdir}/pkg/etc/httpd/conf/mod_ssl.txt
- install -D -m644 ../httpd.conf ${startdir}/pkg/etc/httpd/conf/httpd.conf
- # move suexec to the right place
- mv ${startdir}/pkg/usr/sbin/suexec ${startdir}/pkg/usr/bin/suexec
- # copy in extra config files
- mkdir -p ${startdir}/pkg/etc/httpd/conf/extra
- cp docs/conf/extra/*.conf ${startdir}/pkg/etc/httpd/conf/extra/
- # symlinks needed for the ServerRoot setting (/etc/httpd/conf)
- ln -s /usr/lib/apache ${startdir}/pkg/etc/httpd/modules
- ln -s /var/log/httpd ${startdir}/pkg/etc/httpd/logs
-
- # config change
- sed -i 's|^ServerTokens.*$|ServerTokens Prod|g' \
- ${startdir}/pkg/etc/httpd/conf/extra/httpd-default.conf
+ make DESTDIR=${pkgdir} install || return 1
+ install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd
+ install -D -m644 ${srcdir}/httpd.logrotate ${pkgdir}/etc/logrotate.d/httpd
+ # remove the manual
+ rm -rf ${pkgdir}/usr/share/httpd/manual
}
\ No newline at end of file
Deleted: apache.install
===================================================================
--- apache.install 2008-06-19 20:38:01 UTC (rev 3116)
+++ apache.install 2008-06-20 00:41:43 UTC (rev 3117)
@@ -1,14 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- /bin/true
- if [ `vercmp $2 2.2.0-1` -le 0 ]; then
- echo "==> Please be aware that the apache configuration has changed somewhat"
- echo "==> in the 2.2 versions. Please check your httpd.conf file and make"
- echo "==> the appropriate changes before restarting apache."
- fi
-}
-
-op=$1
-shift
-$op $*
Modified: httpd
===================================================================
--- httpd 2008-06-19 20:38:01 UTC (rev 3116)
+++ httpd 2008-06-20 00:41:43 UTC (rev 3117)
@@ -31,10 +31,10 @@
$0 start
;;
reload)
- if [ -f /var/run/httpd.pid ]; then
- status "Reloading HTTP Configuration" kill -HUP `cat /var/run/httpd.pid`
+ if [ -f /var/run/httpd/httpd.pid ]; then
+ status "Reloading HTTP Configuration" kill -HUP `cat /var/run/httpd/httpd.pid`
fi
;;
*)
- echo "usage: $0 {start|stop|restart|reload}"
+ echo "usage: $0 {start|stop|restart|reload}"
esac
Deleted: httpd.conf
===================================================================
--- httpd.conf 2008-06-19 20:38:01 UTC (rev 3116)
+++ httpd.conf 2008-06-20 00:41:43 UTC (rev 3117)
@@ -1,481 +0,0 @@
-#
-# This is the main Apache HTTP server configuration file. It contains the
-# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
-# In particular, see
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
-# for a discussion of each configuration directive.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do. They're here only as hints or reminders. If you are unsure
-# consult the online docs. You have been warned.
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path. If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "/var/log/httpd/foo.log"
-# with ServerRoot set to "@@ServerRoot@@" will be interpreted by the
-# server as "@@ServerRoot@@//var/log/httpd/foo.log".
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# Do not add a slash at the end of the directory path. If you point
-# ServerRoot at a non-local disk, be sure to point the LockFile directive
-# at a local disk. If you wish to share the same ServerRoot for multiple
-# httpd daemons, you will need to change at least LockFile and PidFile.
-#
-ServerRoot "/etc/httpd"
-
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, instead of the default. See also the <VirtualHost>
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to
-# prevent Apache from glomming onto all bound IP addresses.
-#
-#Listen 12.34.56.78:80
-Listen 80
-
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-LoadModule actions_module modules/mod_actions.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule asis_module modules/mod_asis.so
-LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule auth_digest_module modules/mod_auth_digest.so
-LoadModule authn_anon_module modules/mod_authn_anon.so
-LoadModule authn_dbd_module modules/mod_authn_dbd.so
-LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
-LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
-LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule authz_owner_module modules/mod_authz_owner.so
-LoadModule authz_user_module modules/mod_authz_user.so
-LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule cern_meta_module modules/mod_cern_meta.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule dav_module modules/mod_dav.so
-LoadModule dav_fs_module modules/mod_dav_fs.so
-LoadModule dbd_module modules/mod_dbd.so
-LoadModule deflate_module modules/mod_deflate.so
-LoadModule dir_module modules/mod_dir.so
-LoadModule dumpio_module modules/mod_dumpio.so
-LoadModule env_module modules/mod_env.so
-LoadModule expires_module modules/mod_expires.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
-LoadModule filter_module modules/mod_filter.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule ident_module modules/mod_ident.so
-LoadModule imagemap_module modules/mod_imagemap.so
-LoadModule include_module modules/mod_include.so
-LoadModule info_module modules/mod_info.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule log_forensic_module modules/mod_log_forensic.so
-LoadModule logio_module modules/mod_logio.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
-LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
-LoadModule proxy_connect_module modules/mod_proxy_connect.so
-LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule speling_module modules/mod_speling.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule status_module modules/mod_status.so
-LoadModule suexec_module modules/mod_suexec.so
-LoadModule unique_id_module modules/mod_unique_id.so
-LoadModule userdir_module modules/mod_userdir.so
-LoadModule usertrack_module modules/mod_usertrack.so
-LoadModule version_module modules/mod_version.so
-LoadModule vhost_alias_module modules/mod_vhost_alias.so
-#LoadModule cache_module modules/mod_cache.so
-#LoadModule disk_cache_module modules/mod_disk_cache.so
-#LoadModule mem_cache_module modules/mod_mem_cache.so
-#LoadModule php5_module modules/libphp5.so
-
-<IfModule !mpm_winnt_module>
-<IfModule !mpm_netware_module>
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-#
-User nobody
-Group nobody
-</IfModule>
-</IfModule>
-
-# 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# <VirtualHost> definition. These values also provide defaults for
-# any <VirtualHost> containers you may define later in the file.
-#
-# All of these directives may appear inside <VirtualHost> containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed. This address appears on some server-generated pages, such
-# as error documents. e.g. admin at your-domain.com
-#
-ServerAdmin you at example.com
-
-#
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-#
-#ServerName www.example.com:80
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "/home/httpd/html"
-
-#
-# Each directory to which Apache has access can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories).
-#
-# First, we configure the "default" to be a very restrictive set of
-# features.
-#
-<Directory />
- Options FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
-</Directory>
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-#
-# This should be changed to whatever you set DocumentRoot to.
-#
-<Directory "/home/httpd/html">
- #
- # Possible values for the Options directive are "None", "All",
- # or any combination of:
- # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
- #
- # Note that "MultiViews" must be named *explicitly* --- "Options All"
- # doesn't give it to you.
- #
- # The Options directive is both complicated and important. Please see
- # http://httpd.apache.org/docs/2.2/mod/core.html#options
- # for more information.
- #
- Options Indexes FollowSymLinks
-
- #
- # AllowOverride controls what directives may be placed in .htaccess files.
- # It can be "All", "None", or any combination of the keywords:
- # Options FileInfo AuthConfig Limit
- #
- AllowOverride None
-
- #
- # Controls who can get stuff from this server.
- #
- Order allow,deny
- Allow from all
-
-</Directory>
-
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-<IfModule dir_module>
- <IfModule mod_php5.c>
- DirectoryIndex index.php index.html
- AddType application/x-httpd-php .php
- AddType application/x-httpd-php-source .phps
- </IfModule>
- DirectoryIndex index.html
-</IfModule>
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<FilesMatch "^\.ht">
- Order allow,deny
- Deny from all
-</FilesMatch>
-
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here. If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog /var/log/httpd/error_log
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
-<IfModule log_config_module>
- #
- # The following directives define some format nicknames for use with
- # a CustomLog directive (see below).
- #
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
- LogFormat "%h %l %u %t \"%r\" %>s %b" common
-
- <IfModule logio_module>
- # You need to enable mod_logio.c to use %I and %O
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
- </IfModule>
-
- #
- # The location and format of the access logfile (Common Logfile Format).
- # If you do not define any access logfiles within a <VirtualHost>
- # container, they will be logged here. Contrariwise, if you *do*
- # define per-<VirtualHost> access logfiles, transactions will be
- # logged therein and *not* in this file.
- #
- #CustomLog /var/log/httpd/access_log common
-
- #
- # If you prefer a logfile with access, agent, and referer information
- # (Combined Logfile Format) you can use the following directive.
- #
- CustomLog /var/log/httpd/access_log combined
-</IfModule>
-
-<IfModule alias_module>
- #
- # Redirect: Allows you to tell clients about documents that used to
- # exist in your server's namespace, but do not anymore. The client
- # will make a new request for the document at its new location.
- # Example:
- # Redirect permanent /foo http://www.example.com/bar
-
- #
- # Alias: Maps web paths into filesystem paths and is used to
- # access content that does not live under the DocumentRoot.
- # Example:
- # Alias /webpath /full/filesystem/path
- #
- # If you include a trailing / on /webpath then the server will
- # require it to be present in the URL. You will also likely
- # need to provide a <Directory> section to allow access to
- # the filesystem path.
- #Alias /image/ "/home/httpd/images/"
-
- #
- # ScriptAlias: This controls which directories contain server scripts.
- # ScriptAliases are essentially the same as Aliases, except that
- # documents in the target directory are treated as applications and
- # run by the server when requested rather than as documents sent to the
- # client. The same rules about trailing "/" apply to ScriptAlias
- # directives as to Alias.
- #
- ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
-
-</IfModule>
-
-<IfModule cgid_module>
- #
- # ScriptSock: On threaded servers, designate the path to the UNIX
- # socket used to communicate with the CGI daemon of mod_cgid.
- #
- #Scriptsock /var/run/cgisock
-</IfModule>
-
-#
-# "/home/httpd/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-<Directory "/home/httpd/cgi-bin">
- AllowOverride None
- Options None
- Order allow,deny
- Allow from all
-</Directory>
-
-#
-# DefaultType: the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value. If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-<IfModule mime_module>
- #
- # TypesConfig points to the file containing the list of mappings from
- # filename extension to MIME-type.
- #
- TypesConfig /etc/httpd/conf/mime.types
-
- #
- # AddType allows you to add to or override the MIME configuration
- # file specified in TypesConfig for specific file types.
- #
- #AddType application/x-gzip .tgz
- #
- # AddEncoding allows you to have certain browsers uncompress
- # information on the fly. Note: Not all browsers support this.
- #
- #AddEncoding x-compress .Z
- #AddEncoding x-gzip .gz .tgz
- #
- # If the AddEncoding directives above are commented-out, then you
- # probably should define those extensions to indicate media types:
- #
- AddType application/x-compress .Z
- AddType application/x-gzip .gz .tgz
-
- #
- # AddHandler allows you to map certain file extensions to "handlers":
- # actions unrelated to filetype. These can be either built into the server
- # or added with the Action directive (see below)
- #
- # To use CGI scripts outside of ScriptAliased directories:
- # (You will also need to add "ExecCGI" to the "Options" directive.)
- #
- #AddHandler cgi-script .cgi
-
- # For files that include their own HTTP headers:
- #AddHandler send-as-is asis
-
- # For server-parsed imagemap files:
- #AddHandler imap-file map
-
- # For type maps (negotiated resources):
- #AddHandler type-map var
-
- #
- # Filters allow you to process content before it is sent to the client.
- #
- # To parse .shtml files for server-side includes (SSI):
- # (You will also need to add "Includes" to the "Options" directive.)
- #
- #AddType text/html .shtml
- #AddOutputFilter INCLUDES .shtml
-</IfModule>
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type. The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-#MIMEMagicFile /etc/httpd/conf/magic
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# EnableMMAP and EnableSendfile: On systems that support it,
-# memory-mapping or the sendfile syscall is used to deliver
-# files. This usually improves server performance, but must
-# be turned off when serving from networked-mounted
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-#
-#EnableMMAP off
-#EnableSendfile off
-
-# Supplemental configuration
-#
-# The configuration files in the /etc/httpd/conf/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/httpd/conf/extra/httpd-mpm.conf
-
-# Multi-language error messages
-Include /etc/httpd/conf/extra/httpd-multilang-errordoc.conf
-
-# Fancy directory listings
-Include /etc/httpd/conf/extra/httpd-autoindex.conf
-
-# Language settings
-Include /etc/httpd/conf/extra/httpd-languages.conf
-
-# User home directories
-Include /etc/httpd/conf/extra/httpd-userdir.conf
-
-# Real-time info on requests and configuration
-#Include /etc/httpd/conf/extra/httpd-info.conf
-
-# Virtual hosts
-#Include /etc/httpd/conf/extra/httpd-vhosts.conf
-
-# Local access to the Apache HTTP Server Manual
-#Include /etc/httpd/conf/extra/httpd-manual.conf
-
-# Distributed authoring and versioning (WebDAV)
-#Include /etc/httpd/conf/extra/httpd-dav.conf
-
-# Various default settings
-Include /etc/httpd/conf/extra/httpd-default.conf
-
-# Secure (SSL/TLS) connections
-#Include /etc/httpd/conf/extra/httpd-ssl.conf
-#
-# Note: The following must must be present to support
-# starting without SSL on platforms with no /dev/random equivalent
-# but a statically compiled-in mod_ssl.
-#
-<IfModule ssl_module>
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-</IfModule>
-
Deleted: httpd.conf.d
===================================================================
--- httpd.conf.d 2008-06-19 20:38:01 UTC (rev 3116)
+++ httpd.conf.d 2008-06-20 00:41:43 UTC (rev 3117)
@@ -1 +0,0 @@
-HTTPD_USE_SSL="no"
Deleted: index.html
===================================================================
--- index.html 2008-06-19 20:38:01 UTC (rev 3116)
+++ index.html 2008-06-20 00:41:43 UTC (rev 3117)
@@ -1,107 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Apache 2 Test Page powered by Arch Linux</title>
-<style type="text/css">
-body
-{
-background-color: #fff;
-color: #000;
-font-family: sans-serif;
-text-align: center;
-}
-#title
-{
-margin: 10%;
-font-size: 24px;
-font-weight: bold;
-}
-.small
-{
-font-size: 14px;
-font-weight: normal;
-}
-img
-{
-border: 0px solid #fff;
-}
-</style>
-</head>
-<body>
-<p id="title">
-Apache 2 Test Page<br />
-<span class="small">powered by</span><br />
-Arch Linux
-</p>
-<p>
-<a href="http://httpd.apache.org/">
-<img src="data:image/gif;base64,
-R0lGODlhAwEgAPcAAP///87OzqWlpYSEhHNzc2tra1paWiEYGP9CGP8xAL1SEN6thO+cQv+EAP/O
-GP/OAM7Oxr29xjEA/2MA/5wA/+8A/+dK79573talzv8AnO9KjP8AY+eEnO9SY/8AGAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAEALAAAAAADASAA
-Rwj/AAMIHEiwoMGDCBMqXMiwocOHECNKnEixokWGEQ4cGDCwwIABAgJsMLAhwwYPKFEmWNnAQYSB
-B/79MxDzXwSZB2j+OxAgpgEDMgn4FLAzwoCZPWUGJTAzAlACAXDq/FcQ6EyrBKzetHmxq9evYMMW
-fEl2g9kKGypQoDBhwj8JSuO+lUB3Atu1FTJQyDAhg0m/BVD+O5kSAQIBLl+KXcy4sePHYiNEaDAA
-QYOVCVIKTvnPgwEPZv2G9ivaZF69pdNmGPCgdesGDxrM/CeAo8ALdSdIaNuW7u7duiVcMHhh7drh
-Ei+QXs68eQYNBjV7WNhBM4aCGDCvZLhAe4KDDBqI/28A+auA8+fLL4yQniD7kOrjy5/v8OV5uW/n
-tl2bIW/fvRlMlZIBCChQU1ECHcVTVLQJJMCBUMW0oEBMKRWSU3JVFddGDsqkGH0ghjhfBAgYsFJn
-oJVk2nIUVGDXWm5ZhZ9ccP32G1sVqDXAXhsAmMAALbnUUAS6tRWABb9N8OFBxRlHwUJOIofdcsNZ
-sNx1CUm3kAbWYecdd18aFN54IpZp5plopqnmmmy26aZBDy450HkFKOaAAA3g2VBNAljFkVEGDGDf
-Ty8ZAJVTBpBFgKAUGiCAU/AJQAB8AkVAQFYyafjPAI4G0Geinhr65qhlGlUTUCDt91+PKkqnUk0f
-bv8FVYWSKfUTTgEcRRt6SU0I1AHoPSpTolZp6umwAcgoJ6nMqvfoTwQUEABfwdE4lwESGHCXi6hN
-MBJhCaDIkniGIbCsfFtR2uy6IhqVklmhqdWfi2zBNWN+vvW2H714oTbSXyaB1sC5E+U7gQUNNenk
-wgwbhyVCGjT3cEIYuGqxqxwYlB1mHYCpHXjjhSzyyAs8hqeJmg2GkoqkscyccWrdNcFPbtk7I1AN
-GBDba605IKTGRU5QEJJFTkyQwg0nvZbRypEm5W3LZXyQlhVt7N3VWGMG8sgilzyqZAFIZlQDGyFw
-AAIpHuDBABsMANrb8JqF0gFxG+XAAHeqe2S+Rh//hEFwEiA8ENJPN8Rc334fPhAHFzeOUsdefrxQ
-d5IXNCbXmIsHAbucd+7556CHLvropJfOOcFhg03RgciKWCxBr5suO0Sm6i0po2hrloBlAyNU07H/
-TCqXsJsSZdOvySoFbFJW8XTgAS9VGJemym9lAPOzZ2/QABoJCkABBUCFWgUEmDRSSiztfhjrwBo/
-q0yS4iQh/BVqlCmfz+5kP7AycRS7QK/zyVZ8or0CHkRGt6qLk/yTms94QCkeMMzAakJBAMJPV9ez
-nqSct5M5DetTSckQ7PATEuNdz4AoDFsBgGIAj9hMKb6RAIyM46+9EABcHliJAiyDGNUlhD0MeVRX
-/1iYQhSKjT0v6VZvXgjDfMnQLn3pVtw048AcNqBceoPMBXJSxC5WKmy565Ff8jLDttxrLjd6Ihnb
-ohrS3BBcmSkM6ihSl8IlRGl4vADiCnIBC/hRcA2BAAcY57iUcABxGOiAIjvgNYVQbiWNJAgDJknJ
-SlqykpG0yGTc9i6XnaZFMGIifmpko/3gSC0xo0AB5FYYBLDNXBLJzW8AmRCkUeACuMylLgmXEOf4
-ZY8Dkc4gh0lMDmigOinZHEGs5gHIOTJMlgvZAqZJzWpakzF3u0wcVxaatKjmNDlCpV0KABcZnVEm
-wOENb9omntjA5mcIIRJwBkK03aDOlrvMZ5Q0RvOlwV0pS5pZCAYOicisGfRqWxPPJSeZSfWMzUQr
-2QxKSMLNbi7nNP3xy17I2KK+xMwAM7tVXH5iAPHAUyB/S5I6eZMkxNkSj8bRIx99SVOpFYRqCeGA
-Ig+pMe8UkwPWfKTWxCTNoC5AmWmSTG1c6Z0cuqpHFWWlAf5CGJKoqADthI1rfPYh3ABHjxgIawDC
-StYLLLFwvIxI0/wCVrK6NawcWA50CCLMnw7zmJpBKkqhmRChfoeo46GkUa/pRdrpco7uOexAMKBL
-YPpNlxAZ6DAnJlm7WlavA4FANR0rEM1W8yCDDS01C0va0pr2tKg9CEACBAQAOw==
-" alt="Powered by Apache" title="Powered by Apache" />
-</a>
-</p>
-<p>
-<a href="http://archlinux.org/">
-<img src="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAFAAAAAPCAYAAABzyUiPAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBI
-WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1AsYAwg6q5VXGwAAAB10RVh0Q29tbWVudABDcmVhdGVk
-IHdpdGggVGhlIEdJTVDvZCVuAAACqUlEQVRYw+2Y3UtTYRzHP+dFXc1p6maQNl2lmJniHAPrJsug
-O4lgeFvQvPI/MLzZf+DV/oUFgSBFsKggJMTKUMnXXM2arJzHZdt82+nCZvO4F9/IoH2vzvN7nt/h
-eT58f+f8zhGcTqdKTgeWDOB2u3MkDqCurq4tgADdrn4ASopPsLQcBUBXIFNafBJRFFhUIkRj6//E
-xvt6OvB6vce6h/b29j8OTFYCXn6exI0rtdRdOI0siYxNBRgcnmMpHM1ZT1vCqWRvMmNtqESSRACa
-6yvZ3Izz4vUMsdWNHLnfElMFz5nLsDWat+EByLJIy+Wz1FhMRH+G2dxYz1hifT0dKWPaeKb1qa5T
-yeFwZIxp59PN7TUnI8D8PIlai4miQh2qqhJeieGbD6GEo8iSiL3JjKlMz+jQE5TvX1PC6Hb10+3q
-33XwVPFM649S6QCkk8fj2c5xOBx4PJ69lXBRoY7qylJEUSAQDON9NcmiEsGgL+CqzcL5KiMmYxkz
-44PMTQxx+54rJcR0zkx+YWmljR8l0ASQdCAOmrPLgeVGA+VGA5HoGg8fjzD7eRElHMUfUBh4No7P
-H8LaUEEo6Ic0HWTCUdkAZQOf7j6Hhbgf12bL2QWwqqIEURB4OzZPSInsmAuFFB49fU/vg15OlZ3B
-fr1z34fQlmpinCjlw5ToXuBo3ZQApHVa8jgTRMHpdKput3t78/c7Wyky6PAMvMMfUABQ43F8U8NM
-jDyn0XaN0TcvsbbewlhxCVGS/ts+cEcjnZCxVM+07xvLP6KEgn4W/JMEv0yj0xdT33KTTx/HuHO3
-B0kUCa/Ecn2gNjAxG+TDzAKx1TUkWcZy0U5dcxuiuOW0qhorsdV1ZEnMNYHJABPPpbiq0marRhCE
-jImqqmZd8zc+pY5bQu5vzOH0C2jxKDzqBF7KAAAAAElFTkSuQmCC
-" alt="Powered by Arch Linux" title="Powered by Arch Linux" />
-</a>
-</p>
-</body>
-</html>
Deleted: mod_ssl.txt
===================================================================
--- mod_ssl.txt 2008-06-19 20:38:01 UTC (rev 3116)
+++ mod_ssl.txt 2008-06-20 00:41:43 UTC (rev 3117)
@@ -1,23 +0,0 @@
-To use apache with SSL you will have to do three things:
-
-1) Create an ssl key, request, and certificate.
-
- # This generates the cert and key (valid for 3650 days)
- # Be sure to enter the FQDN of your apache server as the "Common Name".
- openssl req -new -x509 -newkey rsa:1024 -days 3650 \
- -keyout server.key -out server.crt
- # This will remove the passphrase
- openssl rsa -in server.key -out server.key
-
-2) Modify /etc/httpd/conf/extra/httpd-ssl.conf to use your new certificate.
-
- SSLCertificateFile /etc/httpd/conf/server.crt
- SSLCertificateKeyFile /etc/httpd/conf/server.key
-
-3) Un-comment the SSL configuration line in /etc/httpd/conf/httpd.conf
-
- Include /etc/httpd/conf/extra/httpd-ssl.conf
-
-Done! You can start apache with '/etc/rc.d/httpd start'. If it hangs or fails
-to start, check the /var/log/httpd/error_log or try running
-'/usr/sbin/apachectl start' and looking for errors/prompts.
More information about the arch-commits
mailing list