Apache 2.5 from Git, with all systemd features enabled.

11 files changed, 661 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..f4fcbac82bbd
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,44 @@
+pkgbase = apache25
+	pkgdesc = A high performance Unix-based HTTP server
+	pkgver = 2.5.r27203.e4f56ef
+	pkgrel = 1
+	url = http://www.apache.org/dist/httpd
+	install = httpd.install
+	arch = i686
+	arch = x86_64
+	license = APACHE
+	makedepends = openssl
+	depends = zlib
+	depends = apr-util
+	depends = pcre
+	depends = systemd
+	provides = apache=2.5
+	conflicts = apache
+	backup = etc/httpd/conf/httpd.conf
+	source = httpd::git://git.apache.org/httpd.git
+	source = arch.layout
+	source = http://www.apache.org/dist/apr/apr-1.5.2.tar.bz2
+	source = http://www.apache.org/dist/apr/apr-util-1.5.4.tar.bz2
+	source = httpd.conf
+	source = httpd.usr.conf
+	source = modules.conf.in
+	source = httpd.logrotate
+	source = httpd.service
+	source = httpd.socket
+	source = httpd.tmpfiles
+	source = httpd.install
+	sha256sums = SKIP
+	sha256sums = dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3
+	sha256sums = 7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a
+	sha256sums = a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e
+	sha256sums = ecda7f08c45bbbce59c11b611493eb673743585c39824bb3a963b184e86a008c
+	sha256sums = 570cf1255c14c4d8420ac9bc20c66756690a1e651627b6e7fe1f8f47c7edde10
+	sha256sums = 53f36ac9834e34a2295cfa1e19dd28be0fa2178dc60c4fd2bc245e86d4e3f9c7
+	sha256sums = 875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3
+	sha256sums = 46010e22039717894d074d32130ff98dc0517d51380bf0938d465d586af292be
+	sha256sums = f4c967641f8889c02f96c46ac1925aac4cc9282a576f118ac5681c46ff957840
+	sha256sums = 26ab348276659fdf8bafbf15e1e9e78ff0ee64527694d02acf40d3aa74b91338
+	sha256sums = e0f9c4e836490c182149604614208ffa977e6e18f81c27bab60ae1b8418b5cd5
+
+pkgname = apache25
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..8d018fb52f2b
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,129 @@
+# $Id$
+# Maintainer: Janusz Lewandowski <lew21@xtreeme.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=apache25
+pkgver=2.5.r27203.e4f56ef
+pkgrel=1
+pkgdesc='A high performance Unix-based HTTP server'
+arch=('i686' 'x86_64')
+url='http://www.apache.org/dist/httpd'
+provides=('apache=2.5')
+conflicts=('apache')
+license=('APACHE')
+backup=(etc/httpd/conf/httpd.conf)
+depends=('zlib' 'apr-util' 'pcre' 'systemd')
+makedepends=('openssl')
+install=httpd.install
+source=(
+	httpd::git://git.apache.org/httpd.git
+	arch.layout
+	http://www.apache.org/dist/apr/apr-1.5.2.tar.bz2
+	http://www.apache.org/dist/apr/apr-util-1.5.4.tar.bz2
+	httpd.conf
+	httpd.usr.conf
+	modules.conf.in
+	httpd.logrotate
+	httpd.service
+	httpd.socket
+	httpd.tmpfiles
+	httpd.install
+)
+sha256sums=(
+	'SKIP'
+	'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
+	'7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a'
+	'a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e'
+	'ecda7f08c45bbbce59c11b611493eb673743585c39824bb3a963b184e86a008c'
+	'570cf1255c14c4d8420ac9bc20c66756690a1e651627b6e7fe1f8f47c7edde10'
+	'53f36ac9834e34a2295cfa1e19dd28be0fa2178dc60c4fd2bc245e86d4e3f9c7'
+	'875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
+	'46010e22039717894d074d32130ff98dc0517d51380bf0938d465d586af292be'
+	'f4c967641f8889c02f96c46ac1925aac4cc9282a576f118ac5681c46ff957840'
+	'26ab348276659fdf8bafbf15e1e9e78ff0ee64527694d02acf40d3aa74b91338'
+	'e0f9c4e836490c182149604614208ffa977e6e18f81c27bab60ae1b8418b5cd5'
+)
+
+pkgver() {
+	cd "httpd"
+	printf "2.5.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+	cd httpd
+
+	cp "${srcdir}/modules.conf.in" docs/conf/httpd.conf.in
+	cat "${srcdir}/arch.layout" >> config.layout
+
+	rm -f srclib/apr
+	ln -s "${srcdir}/apr-1.5.2" srclib/apr
+	rm -f srclib/apr-util
+	ln -s "${srcdir}/apr-util-1.5.4" srclib/apr-util
+
+	sed -i '1 s/python/python2/' srclib/apr/build/gen-build.py
+}
+
+build() {
+	cd httpd
+
+	./buildconf
+
+	./configure --sbindir=/usr/bin \
+		--enable-layout=Arch \
+		--enable-mpms-shared=all \
+		--enable-modules=all \
+		--enable-mods-shared=all \
+		--enable-so \
+		--disable-authn-core \
+		--disable-authn-anon \
+		--disable-authn-dbd \
+		--disable-authn-dbm \
+		--disable-authn-file \
+		--disable-authn-socache \
+		--disable-authnz-ldap \
+		--enable-authz-core \
+		--disable-authz-dbd \
+		--disable-authz-dbm \
+		--disable-authz-groupfile \
+		--disable-authz-host \
+		--disable-authz-owner \
+		--disable-authz-user \
+		--disable-ldap \
+		--disable-lua \
+		--disable-proxy-html \
+		--disable-xml2enc \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
+		--with-pcre=/usr
+
+	make
+}
+
+package() {
+	cd httpd
+
+	make DESTDIR="${pkgdir}" install
+
+	mv "${pkgdir}/etc/httpd/conf" "${pkgdir}/usr/lib/httpd/conf"
+	mv "${pkgdir}/usr/lib/httpd/conf/httpd.conf" "${pkgdir}/usr/lib/httpd/conf/modules.conf"
+
+	sed -e 's/#LoadModule systemd_module/LoadModule systemd_module/' \
+		-e 's/#LoadModule journald_module/LoadModule journald_module/' \
+		-i ${pkgdir}/usr/lib/httpd/conf/modules.conf
+
+	install -D -m644 "${srcdir}/httpd.conf" "${pkgdir}/etc/httpd/conf/httpd.conf"
+	install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
+	install -D -m644 "${srcdir}/httpd.usr.conf" "${pkgdir}/usr/lib/httpd/conf/httpd.conf"
+	install -D -m644 "${srcdir}/httpd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/httpd.conf"
+	install -D -m644 "${srcdir}/httpd.socket" "${pkgdir}/usr/lib/systemd/system/httpd.socket"
+	install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service"
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+	# cleanup
+	rm -r "${pkgdir}/usr/share/httpd/manual"
+	rm -r "${pkgdir}/var"
+	rm -r "${pkgdir}/srv"
+	rm -r "${pkgdir}/run"
+}
\ No newline at end of file
diff --git a/arch.layout b/arch.layout
new file mode 100644
index 000000000000..d5d2e8a08f84
--- /dev/null
+++ b/arch.layout
@@ -0,0 +1,22 @@
+<Layout Arch>
+	prefix:          /etc/httpd
+	exec_prefix:     /usr
+	bindir:          /usr/bin
+	sbindir:         /usr/bin
+	libdir:          /usr/lib/httpd
+	libexecdir:      /usr/lib/httpd/modules
+	mandir:          /usr/share/man
+	sysconfdir:      /etc/httpd/conf
+	datadir:         /usr/share/httpd
+	installbuilddir: /usr/lib/httpd/build
+	errordir:        /usr/share/httpd/error
+	iconsdir:        /usr/share/httpd/icons
+	htdocsdir:       /srv/http
+	manualdir:       /usr/share/httpd/manual
+	cgidir:          /srv/http/cgi-bin
+	includedir:      /usr/include/httpd
+	localstatedir:   /var
+	runtimedir:      /run/httpd
+	logfiledir:      /var/log/httpd
+	proxycachedir:   /var/cache/httpd
+</Layout>
\ No newline at end of file
diff --git a/httpd.conf b/httpd.conf
new file mode 100644
index 000000000000..ff36f96c6007
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,2 @@
+Include '/usr/lib/httpd/conf/modules.conf'
+Include '/usr/lib/httpd/conf/httpd.conf'
diff --git a/httpd.install b/httpd.install
new file mode 100644
index 000000000000..b90079109239
--- /dev/null
+++ b/httpd.install
@@ -0,0 +1,7 @@
+post_install() {
+	systemd-tmpfiles --create httpd.conf
+}
+
+post_upgrade() {
+	systemd-tmpfiles --create httpd.conf
+}
diff --git a/httpd.logrotate b/httpd.logrotate
new file mode 100644
index 000000000000..c9755de149e0
--- /dev/null
+++ b/httpd.logrotate
@@ -0,0 +1,6 @@
+/var/log/httpd/*log {
+   missingok
+   postrotate
+      /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+   endscript
+}
diff --git a/httpd.service b/httpd.service
new file mode 100644
index 000000000000..1b780655b339
--- /dev/null
+++ b/httpd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Apache 2.5 Web Server
+After=network.target remote-fs.target nss-lookup.target httpd.socket
+Requires=httpd.socket
+
+[Service]
+Type=notify
+User=http
+ExecStart=/usr/bin/httpd -DFOREGROUND
+PrivateTmp=true
+LimitNOFILE=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/httpd.socket b/httpd.socket
new file mode 100644
index 000000000000..af8a8055b88e
--- /dev/null
+++ b/httpd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=HTTP Socket
+
+[Socket]
+ListenStream=80
+
+[Install]
+WantedBy=sockets.target
diff --git a/httpd.tmpfiles b/httpd.tmpfiles
new file mode 100644
index 000000000000..42de73a3b531
--- /dev/null
+++ b/httpd.tmpfiles
@@ -0,0 +1,2 @@
+d /run/httpd 0755 http http -
+d /var/log/httpd 0755 http http -
diff --git a/httpd.usr.conf b/httpd.usr.conf
new file mode 100644
index 000000000000..31464c0d279a
--- /dev/null
+++ b/httpd.usr.conf
@@ -0,0 +1,414 @@
+#
+# 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/trunk/> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/trunk/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 "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" 
+# will be interpreted as '/logs/access_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 specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot "/usr/lib/httpd"
+
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:/run/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
+
+<IfModule unixd_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 http
+Group http
+
+</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@your-domain.com
+#
+ServerAdmin you@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
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other 
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</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.
+#
+
+#
+# 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.
+#
+
+Define DOCROOT "/srv/http"
+DocumentRoot "${DOCROOT}"
+<Directory "${DOCROOT}">
+    #
+    # 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/trunk/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:
+    #   AllowOverride FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog journald
+# 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 journald
+
+#
+# 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.
+
+    #
+    # 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/ "/srv/http/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 cgisock
+</IfModule>
+
+#
+# "/srv/http/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/srv/http/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig 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 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 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
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall may be 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.
+# Defaults: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+#EnableSendfile on
+
+# Supplemental configuration
+#
+# The configuration files in the 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 conf/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include conf/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+#Include conf/extra/httpd-autoindex.conf
+
+# Language settings
+#Include conf/extra/httpd-languages.conf
+
+# User home directories
+#Include conf/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include conf/extra/httpd-info.conf
+
+# Virtual hosts
+#Include conf/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+#Include conf/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include conf/extra/httpd-dav.conf
+
+# Various default settings
+#Include conf/extra/httpd-default.conf
+
+# Policy enforcement
+#Include conf/extra/httpd-policy.conf
+
+# Configuration macros
+#Included conf/extra/httpd-macro.conf
+
+# Configure mod_proxy_html to understand HTML4/XHTML1
+<IfModule proxy_html_module>
+Include conf/extra/proxy-html.conf
+</IfModule>
+
+# Secure (SSL/TLS) connections
+#Include 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>
+#
+# Uncomment the below to deal with user agents that deliberately
+# violate open standards by misusing DNT (DNT *must* be a specific
+# end-user choice)
+#
+#<IfModule setenvif_module>
+#BrowserMatch "MSIE 10.0;" bad_DNT
+#</IfModule>
+#<IfModule headers_module>
+#RequestHeader unset DNT env=bad_DNT
+#</IfModule>
+
diff --git a/modules.conf.in b/modules.conf.in
new file mode 100644
index 000000000000..798cb30f6723
--- /dev/null
+++ b/modules.conf.in
@@ -0,0 +1,13 @@
+#
+# 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@@