upgrade from apache 2.0 to 2.2

testing/hosts/winnetou/etc/apache2/modules.d/00_mod_mime.conf

@@ -0,0 +1,61 @@
+# 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/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>
+
+<IfModule mime_magic_module>
+# 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/apache2/magic
+</IfModule>
+
+# vim: ts=4 filetype=apache

testing/hosts/winnetou/etc/apache2/vhosts.d/01_ocsp_vhost.conf

@@ -1,36 +1,51 @@
 # OCSP Server
 
+Listen 8880
+
 <VirtualHost *:8880>
     ServerAdmin  [email protected]
     DocumentRoot /etc/openssl/ocsp
     ServerName   ocsp.strongswan.org
     ServerAlias	 192.168.0.150
+    DirectoryIndex ocsp.cgi
     <Directory "/etc/openssl/ocsp">
-       Options      +ExecCGI
+       Options  +ExecCGI
+       Order allow,deny
+       Allow from all
    </Directory>
    ErrorLog     /var/log/apache2/ocsp/error_log
    CustomLog    /var/log/apache2/ocsp/access_log combined
 </VirtualHost>
 
+Listen 8881
+
 <VirtualHost *:8881>
     ServerAdmin  [email protected]
     DocumentRoot /etc/openssl/research/ocsp
     ServerName   ocsp.research.strongswan.org
     ServerAlias	 ocsp.strongswan.org 192.168.0.150
+    DirectoryIndex ocsp.cgi
     <Directory "/etc/openssl/research/ocsp">
-       Options      +ExecCGI
+       Options +ExecCGI
+       Order allow,deny
+       Allow from all
    </Directory>
    ErrorLog     /var/log/apache2/ocsp/error_log
    CustomLog    /var/log/apache2/ocsp/access_log combined
 </VirtualHost>
 
+Listen 8882
+
 <VirtualHost *:8882>
     ServerAdmin  [email protected]
     DocumentRoot /etc/openssl/sales/ocsp
     ServerName   ocsp.sales.strongswan.org
     ServerAlias	 ocsp.strongswan.org 192.168.0.150
+    DirectoryIndex ocsp.cgi
     <Directory "/etc/openssl/sales/ocsp">
-       Options      +ExecCGI
+       Options +ExecCGI
+       Order allow,deny
+       Allow from all
    </Directory>
    ErrorLog     /var/log/apache2/ocsp/error_log
    CustomLog    /var/log/apache2/ocsp/access_log combined

testing/hosts/winnetou/etc/conf.d/apache2

@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/strongswan/testing/hosts/winnetou/etc/conf.d/apache2,v 1.2 2006/01/06 12:21:21 as Exp $
-
-# Config file for /etc/init.d/apache2
-
-# An example from /etc/apache2/conf/modules.d/40_mod_ssl.conf:
-#
-# <IfDefine SSL>
-#  <IfModule !mod_ssl.c>
-#    LoadModule ssl_module    extramodules/mod_ssl.so
-#  </IfModule>
-# </IfDefine>
-#
-# This means that the mod_ssl.so DSO module is only loaded
-# into the server when you pass "-D SSL" at startup.  To
-# enable WebDAV, add "-D DAV -D DAV_FS".  If you installed
-# mod_php then add "-D PHP4".  For more options, please
-# read the files in the /etc/apache2/conf/modules.d directory.
-
-APACHE2_OPTS="-D SSL -D DEFAULT_VHOST"
-
-# Extended options for advanced uses of Apache ONLY
-# You don't need to edit these unless you are doing crazy Apache stuff
-# As not having them set correctly, or feeding in an incorrect configuration
-# via them will result in Apache failing to start
-# YOU HAVE BEEN WARNED.
-
-# ServerRoot setting
-#SERVERROOT=/etc/apache2
-
-# Configuration file location
-# - If this does NOT start with a '/', then it is treated relative to
-# $SERVERROOT by Apache
-#CONFIGFILE=conf/apache2.conf
-
-# Location to log startup errors to
-# They are normally dumped to your terminal.
-#STARTUPERRORLOG="/var/log/apache2/startuperror.log"
-
-# PID file location
-# Note that this MUST match the setting in your configuration file!
-PIDFILE=/var/run/apache2.pid
-
-# Restart style
-# see http://httpd.apache.org/docs-2.0/stopping.html for more details
-# the default is 'graceful', the other possible value is 'restart'
-# If you use 'graceful', completion of the command does NOT imply that the system
-# has finished restarting. Restart is finished only when all child processes
-# have finished serving their current request sets. Read the URL for details.
-#RESTARTSTYLE="restart"
-RESTARTSTYLE="graceful"