From e042b7bced715a9d0d6c660df453b1b68f263316 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 26 Jan 2017 14:30:08 +0100
Subject: Drop ancient unused files.

---
 apache/ErrorDocument/401.da.shtml       |  12 -
 apache/ErrorDocument/401.en.shtml       |  12 -
 apache/ErrorDocument/401.shtml          |  12 -
 apache/ErrorDocument/403.da.shtml       |  12 -
 apache/ErrorDocument/403.en.shtml       |  11 -
 apache/ErrorDocument/403.shtml          |  11 -
 apache/ErrorDocument/404.da.shtml       |  17 -
 apache/ErrorDocument/404.en.shtml       |  17 -
 apache/ErrorDocument/404.shtml          |  17 -
 apache/ErrorDocument/500.en.shtml       |  14 -
 apache/ErrorDocument/500.shtml          |  14 -
 apache/ErrorDocument/Makefile           |   6 -
 apache/ErrorDocument/foot.da.shtml      |  21 --
 apache/ErrorDocument/foot.en.shtml      |  21 --
 apache/ErrorDocument/foot.shtml         |  31 --
 apache/ErrorDocument/head.shtml         |  32 --
 apache/ErrorDocument/test/403/.htaccess |   1 -
 apache/ErrorDocument/test/500/.htaccess |   1 -
 apache/apache-ssl.cf                    | 407 ---------------------
 apache/apache.cf                        | 357 ------------------
 apache/include.d/README                 |   8 -
 apache/include.d/htfiles                |   4 -
 apache/include.d/index.anything         |   3 -
 apache/include.d/log-vhosts             |   4 -
 apache/includes/ErrorDocument           |  22 --
 apache/includes/ServerSignature         |   1 -
 apache/includes/misc                    |  47 ---
 apache/includes/misc-php4               |  52 ---
 apache/includes/nocc                    |   2 -
 apache/includes/user-admin              |  13 -
 apache/mksuexec/Makefile                |   5 -
 apache/mksuexec/suexec.c                | 620 --------------------------------
 apache/mksuexec/suexec.c.diff           |  11 -
 apache/mksuexec/suexec.h                | 107 ------
 apache/vhosts.d/00Virtual               |  17 -
 apache/vhosts.d/0DEFAULT                |  17 -
 apache/vhosts.d/README                  |  15 -
 apache/vhosts.d/admin                   |  43 ---
 apache/vhosts.d/cups                    |  12 -
 apache/vhosts.d/horde2                  |  12 -
 apache/vhosts.d/kiosk                   |   7 -
 apache/vhosts.d/mail                    |  29 --
 apache/vhosts.d/stats                   |  26 --
 apache/vhosts.d/wiki                    |  12 -
 apache/vhosts.d/wpad                    |   6 -
 apache/vhosts.include.d/local-zope      |   6 -
 apache/vhosts.m4/vhost.m4               |  30 --
 apache/virtual/VIRTUAL                  |  38 --
 apache/virtual/VIRTUAL-nopam            |  38 --
 apache/wpad/wpad.dat                    |   4 -
 50 files changed, 2237 deletions(-)
 delete mode 100644 apache/ErrorDocument/401.da.shtml
 delete mode 100644 apache/ErrorDocument/401.en.shtml
 delete mode 100644 apache/ErrorDocument/401.shtml
 delete mode 100644 apache/ErrorDocument/403.da.shtml
 delete mode 100644 apache/ErrorDocument/403.en.shtml
 delete mode 100644 apache/ErrorDocument/403.shtml
 delete mode 100644 apache/ErrorDocument/404.da.shtml
 delete mode 100644 apache/ErrorDocument/404.en.shtml
 delete mode 100644 apache/ErrorDocument/404.shtml
 delete mode 100644 apache/ErrorDocument/500.en.shtml
 delete mode 100644 apache/ErrorDocument/500.shtml
 delete mode 100644 apache/ErrorDocument/Makefile
 delete mode 100644 apache/ErrorDocument/foot.da.shtml
 delete mode 100644 apache/ErrorDocument/foot.en.shtml
 delete mode 100644 apache/ErrorDocument/foot.shtml
 delete mode 100644 apache/ErrorDocument/head.shtml
 delete mode 100644 apache/ErrorDocument/test/403/.htaccess
 delete mode 100644 apache/ErrorDocument/test/500/.htaccess
 delete mode 100755 apache/apache-ssl.cf
 delete mode 100755 apache/apache.cf
 delete mode 100644 apache/include.d/README
 delete mode 100644 apache/include.d/htfiles
 delete mode 100644 apache/include.d/index.anything
 delete mode 100644 apache/include.d/log-vhosts
 delete mode 100644 apache/includes/ErrorDocument
 delete mode 100644 apache/includes/ServerSignature
 delete mode 100644 apache/includes/misc
 delete mode 100644 apache/includes/misc-php4
 delete mode 100644 apache/includes/nocc
 delete mode 100644 apache/includes/user-admin
 delete mode 100644 apache/mksuexec/Makefile
 delete mode 100644 apache/mksuexec/suexec.c
 delete mode 100644 apache/mksuexec/suexec.c.diff
 delete mode 100644 apache/mksuexec/suexec.h
 delete mode 100644 apache/vhosts.d/00Virtual
 delete mode 100644 apache/vhosts.d/0DEFAULT
 delete mode 100644 apache/vhosts.d/README
 delete mode 100644 apache/vhosts.d/admin
 delete mode 100644 apache/vhosts.d/cups
 delete mode 100644 apache/vhosts.d/horde2
 delete mode 100644 apache/vhosts.d/kiosk
 delete mode 100644 apache/vhosts.d/mail
 delete mode 100644 apache/vhosts.d/stats
 delete mode 100644 apache/vhosts.d/wiki
 delete mode 100644 apache/vhosts.d/wpad
 delete mode 100644 apache/vhosts.include.d/local-zope
 delete mode 100644 apache/vhosts.m4/vhost.m4
 delete mode 100644 apache/virtual/VIRTUAL
 delete mode 100644 apache/virtual/VIRTUAL-nopam
 delete mode 100644 apache/wpad/wpad.dat

(limited to 'apache')

diff --git a/apache/ErrorDocument/401.da.shtml b/apache/ErrorDocument/401.da.shtml
deleted file mode 100644
index 8acacbc..0000000
--- a/apache/ErrorDocument/401.da.shtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--#set var="title" value="Krav om autorisation"
---><!--#include virtual="head" --><P>
-Denne server kunne ikke verificere, at du er tilladt adgang til det 
-anmodede dokument:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-Enten har du opgivet forkerte adgangsoplysninger (f.eks. forkert 
-adgangskode), eller din browser forst&aring;r ikke at videregive 
-informationerne.
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/401.en.shtml b/apache/ErrorDocument/401.en.shtml
deleted file mode 100644
index d06e282..0000000
--- a/apache/ErrorDocument/401.en.shtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--#set var="title" value="Authorization Required"
---><!--#include virtual="head" --><P>
-This server could not verify that you are authorized to access the document 
-requested:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-Either you supplied the wrong credentials (e.g., bad password), 
-or your browser doesn't understand how to supply the credentials 
-required.
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/401.shtml b/apache/ErrorDocument/401.shtml
deleted file mode 100644
index d06e282..0000000
--- a/apache/ErrorDocument/401.shtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--#set var="title" value="Authorization Required"
---><!--#include virtual="head" --><P>
-This server could not verify that you are authorized to access the document 
-requested:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-Either you supplied the wrong credentials (e.g., bad password), 
-or your browser doesn't understand how to supply the credentials 
-required.
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/403.da.shtml b/apache/ErrorDocument/403.da.shtml
deleted file mode 100644
index 1ceb41b..0000000
--- a/apache/ErrorDocument/403.da.shtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--#set var="title" value="Forbudt"
---><!--#include virtual="head" --><P>
-Du har ikke tilladelse til at f&aring; adgang til det anmodede dokument 
-p&aring; denne server:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-</P>
-<P>
-Farvel og tak...
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/403.en.shtml b/apache/ErrorDocument/403.en.shtml
deleted file mode 100644
index cb0f2c8..0000000
--- a/apache/ErrorDocument/403.en.shtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--#set var="title" value="Forbidden"
---><!--#include virtual="head" --><P>
-You don't have permission to access the requested document on this server:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-</P>
-<P>
-Have a nice day - somewhere else...
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/403.shtml b/apache/ErrorDocument/403.shtml
deleted file mode 100644
index cb0f2c8..0000000
--- a/apache/ErrorDocument/403.shtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--#set var="title" value="Forbidden"
---><!--#include virtual="head" --><P>
-You don't have permission to access the requested document on this server:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-</P>
-<P>
-Have a nice day - somewhere else...
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/404.da.shtml b/apache/ErrorDocument/404.da.shtml
deleted file mode 100644
index 112b69b..0000000
--- a/apache/ErrorDocument/404.da.shtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--#set var="title" value="Ikke fundet"
---><!--#include virtual="head" --><P>
-Den anmodede URL blev ikke fundet p&aring; denne server:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-</P>
-<P>
-<!--#if expr="\"$HTTP_REFERER\" != \"\"" -->
-Inform&eacute;r venligst ejeren af 
-<A HREF="<!--#echo var="HTTP_REFERER" -->">den foreg&aring;ende side</A> om 
-den forkert formulerede link.
-<!--#else -->
-Check venligst din anmodning for tastefejl og pr&oslash;v igen.
-<!--#endif -->
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/404.en.shtml b/apache/ErrorDocument/404.en.shtml
deleted file mode 100644
index 09226e0..0000000
--- a/apache/ErrorDocument/404.en.shtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--#set var="title" value="Not Found"
---><!--#include virtual="head" --><P>
-The requested URL was not found on this server:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-</P>
-<P>
-<!--#if expr="\"$HTTP_REFERER\" != \"\"" -->
-Please inform the owner of
-<A HREF="<!--#echo var="HTTP_REFERER" -->">the referring page</A> about 
-the malformed link.
-<!--#else -->
-Please check your request for typing errors and retry.
-<!--#endif -->
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/404.shtml b/apache/ErrorDocument/404.shtml
deleted file mode 100644
index 09226e0..0000000
--- a/apache/ErrorDocument/404.shtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--#set var="title" value="Not Found"
---><!--#include virtual="head" --><P>
-The requested URL was not found on this server:
-<BLOCKQUOTE>
-<STRONG><!--#echo var="REQUEST_URI" --></STRONG>
-</BLOCKQUOTE>
-</P>
-<P>
-<!--#if expr="\"$HTTP_REFERER\" != \"\"" -->
-Please inform the owner of
-<A HREF="<!--#echo var="HTTP_REFERER" -->">the referring page</A> about 
-the malformed link.
-<!--#else -->
-Please check your request for typing errors and retry.
-<!--#endif -->
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/500.en.shtml b/apache/ErrorDocument/500.en.shtml
deleted file mode 100644
index a0bc9b2..0000000
--- a/apache/ErrorDocument/500.en.shtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--#set var="title" value="Internal Server Error"
---><!--#include virtual="head" --><P>
-The server encountered an internal error or misconfiguration and was unable 
-to complete your request.
-</P>
-<P>
-Please contact the server administrator, <!--#echo var="SERVER_ADMIN" --> 
-and inform them of the time the error occurred, and anything you might have 
-done that may have caused the error.
-</P>
-<P>
-More information about this error may be available in the server error log.
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/500.shtml b/apache/ErrorDocument/500.shtml
deleted file mode 100644
index a0bc9b2..0000000
--- a/apache/ErrorDocument/500.shtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--#set var="title" value="Internal Server Error"
---><!--#include virtual="head" --><P>
-The server encountered an internal error or misconfiguration and was unable 
-to complete your request.
-</P>
-<P>
-Please contact the server administrator, <!--#echo var="SERVER_ADMIN" --> 
-and inform them of the time the error occurred, and anything you might have 
-done that may have caused the error.
-</P>
-<P>
-More information about this error may be available in the server error log.
-</P>
-<!--#include virtual="foot" -->
diff --git a/apache/ErrorDocument/Makefile b/apache/ErrorDocument/Makefile
deleted file mode 100644
index f8e665a..0000000
--- a/apache/ErrorDocument/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGETS = $(addsuffix .shtml,$(basename $(basename $(wildcard *.en.shtml))))
-
-all: $(TARGETS)
-
-$(TARGETS):
-	cp $(basename $@).en.shtml $@
diff --git a/apache/ErrorDocument/foot.da.shtml b/apache/ErrorDocument/foot.da.shtml
deleted file mode 100644
index f834a49..0000000
--- a/apache/ErrorDocument/foot.da.shtml
+++ /dev/null
@@ -1,21 +0,0 @@
-</DIV>
-<HR>
-<DIV ALIGN="right"><SMALL><SUP>Localtid for serveren:
-<!--#echo var="DATE_LOCAL" -->
-</SUP></SMALL></DIV>
-<DIV ALIGN="center">
-<IMG SRC="<!--#echo var="IMG_logo" -->" BORDER=0 ALIGN="bottom"
-ALT="<!--#echo var="ALT_logo" -->"><BR>
-<SMALL><SUP><!--#set var="var"
-value="Powered by $SERVER_SOFTWARE -- Filen er senest modificeret $LAST_MODIFIED"
---><!--#echo var="var" --></SUP></SMALL>
-</DIV>
-<ADDRESS>Hvis fejlen ligner en ops&aelig;tningsfejl bedes du venligst informere
-<A HREF="mailto:<!--#echo var="SERVER_ADMIN" -->"
-SUBJECT="Feedback vedr. fejlmeddelelse [<!--#echo var="REDIRECT_STATUS" 
--->] <!--#echo var="title" -->, req=<!--#echo var="REQUEST_URI" -->">
-<!--#echo var="SERVER_NAME" -->'s WebMaster</A>.
-</ADDRESS>
-</UL>
-</BODY>
-</HTML>
diff --git a/apache/ErrorDocument/foot.en.shtml b/apache/ErrorDocument/foot.en.shtml
deleted file mode 100644
index 4b75dc1..0000000
--- a/apache/ErrorDocument/foot.en.shtml
+++ /dev/null
@@ -1,21 +0,0 @@
-</DIV>
-<HR>
-<DIV ALIGN="right"><SMALL><SUP>Local Server time:
-<!--#echo var="DATE_LOCAL" -->
-</SUP></SMALL></DIV>
-<DIV ALIGN="center">
-<IMG SRC="<!--#echo var="IMG_logo" -->" BORDER=0 ALIGN="bottom"
-ALT="<!--#echo var="ALT_logo" -->"><BR>
-<SMALL><SUP><!--#set var="var"
-value="Powered by $SERVER_SOFTWARE -- File last modified on $LAST_MODIFIED"
---><!--#echo var="var" --></SUP></SMALL>
-</DIV>
-<ADDRESS>If the indicated error looks like a misconfiguration, please inform
-<A HREF="mailto:<!--#echo var="SERVER_ADMIN" -->"
-SUBJECT="Feedback about Error message [<!--#echo var="REDIRECT_STATUS" 
--->] <!--#echo var="title" -->, req=<!--#echo var="REQUEST_URI" -->">
-<!--#echo var="SERVER_NAME" -->'s WebMaster</A>.
-</ADDRESS>
-</UL>
-</BODY>
-</HTML>
diff --git a/apache/ErrorDocument/foot.shtml b/apache/ErrorDocument/foot.shtml
deleted file mode 100644
index fda2675..0000000
--- a/apache/ErrorDocument/foot.shtml
+++ /dev/null
@@ -1,31 +0,0 @@
-</DIV>
-<HR>
-<DIV ALIGN="right"><SMALL><SUP>Local Server time:
-<!--#echo var="DATE_LOCAL" -->
-</SUP></SMALL></DIV>
-<DIV ALIGN="center">
-<IMG SRC="<!--#echo var="IMG_logo" -->" BORDER=0 ALIGN="bottom"
-ALT="<!--#echo var="ALT_logo" -->"><BR>
-<SMALL><SUP><!--#set var="var"
-value="Powered by $SERVER_SOFTWARE -- File last modified on $LAST_MODIFIED"
---><!--#echo var="var" --></SUP></SMALL>
-</DIV>
-<ADDRESS>If the indicated error looks like a misconfiguration, please inform
-<A HREF="mailto:<!--#echo var="SERVER_ADMIN" -->"
-SUBJECT="Feedback about Error message [<!--#echo var="REDIRECT_STATUS" 
--->] <!--#echo var="title" -->, req=<!--#echo var="REQUEST_URI" -->">
-<!--#echo var="SERVER_NAME" -->'s WebMaster</A>.
-</ADDRESS>
-</UL>
-</BODY>
-<!-- Microsoft Internet Exploder has this stupid "feature" that if an
-error message is shorter than 512 bytes then Microsoft decides that the
-user is better off with the error message being dropped and instead
-replaced with the error message for the same error code internal to the
-browser. So to make a short story long, the reason for writing all this
-noise in a comment that is not even meant to be shown to the end user is
-to make sure what we *want* to show is shown to everybody including the
-unfortunate ones using a browser made by Microsoft. Read more here:
-http://perl.apache.org/docs/tutorials/client/browserbugs/browserbugs.html
--->
-</HTML>
diff --git a/apache/ErrorDocument/head.shtml b/apache/ErrorDocument/head.shtml
deleted file mode 100644
index 8687c27..0000000
--- a/apache/ErrorDocument/head.shtml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-<!--#if expr="\"$SERVER_NAME\" = /.*\.bitbase\.dk/" 
---><!--#set var="IMG_logo" value="http://styles.bitbase.dk/coc/bitbase_logo.gif" 
---><!--#set var="ALT_logo" value="Bitbase" 
---><!--#set var="CSS_ie_default" value="http://styles.bitbase.dk/coc/bitbase.css" 
---><!--#set var="CSS_nn_default" value="http://styles.bitbase.dk/coc/bitbase.css" 
---><!--#else
---><!--#set var="IMG_logo" value="http://$SERVER_NAME:$SERVER_PORT/icons/debian/button-1.gif" 
---><!--#set var="ALT_logo" value="Powered by Linux!" 
---><!--#set var="IMG_Apache" value="http://$SERVER_NAME:$SERVER_PORT/icons/apache_anim.gif" 
---><!--#set var="IMG_Apache" value="http://$SERVER_NAME:$SERVER_PORT/icons/apache_pb.gif" 
---><!--#set var="CSS_ie_default" value="http://styles.bitbase.dk/null.css" 
---><!--#set var="CSS_nn_default" value="http://styles.bitbase.dk/null.css" 
---><!--#endif
---><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>
-[<!--#echo var="REDIRECT_STATUS" -->] <!--#echo var="title" -->
-</TITLE>
-<LINK rel="StyleSheet" href="<!--#echo var="CSS_nn_default" -->" type="text/css">
-<STYLE type="text/css">
-@import url("<!--#echo var="CSS_ie_default" -->");
-</STYLE>
-</HEAD>
-<BODY><UL>
-<H1 ALIGN="center">
-[<!--#echo var="REDIRECT_STATUS" -->] <!--#echo var="title" -->
-</H1>
-<HR><!-- ======================================================== -->
-<DIV>
diff --git a/apache/ErrorDocument/test/403/.htaccess b/apache/ErrorDocument/test/403/.htaccess
deleted file mode 100644
index 8d2f256..0000000
--- a/apache/ErrorDocument/test/403/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
diff --git a/apache/ErrorDocument/test/500/.htaccess b/apache/ErrorDocument/test/500/.htaccess
deleted file mode 100644
index c1b0730..0000000
--- a/apache/ErrorDocument/test/500/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-x
\ No newline at end of file
diff --git a/apache/apache-ssl.cf b/apache/apache-ssl.cf
deleted file mode 100755
index 86f2f8a..0000000
--- a/apache/apache-ssl.cf
+++ /dev/null
@@ -1,407 +0,0 @@
-#! /usr/bin/cfengine -qvf
-
-control:
-	OutputPrefix	= ("${cf_prefix}")
-	actionsequence	= ( editfiles shellcommands processes )
-	AddInstallable	= ( apache_ssl_reload )
-	EditfileSize	= ( 50000 )
-
-editfiles:
-    any::
-	{ /etc/apache-ssl/httpd.conf
-		DefineClasses "apache_ssl_reload"
-		#
-		# ServerAdmin webmaster@$(domain)
-		#
-		# (Try to add it _before_ virtual hosts)
-		#
-		WarnIfNoLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]].*"
-		BeginGroupIfNoLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]].*"
-			BeginGroupIfNoLineMatching "^(### Section 3: Virtual Hosts|#?NameVirtualHost.*|#?VirtualHost.*)$"
-				Append "ServerAdmin webmaster@$(domain)"
-			EndGroup
-			BeginGroupIfNoLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]].*"
-				LocateLineMatching "^(### Section 3: Virtual Hosts|#?NameVirtualHost.*|#?VirtualHost.*)$"
-				InsertLine "ServerAdmin webmaster@$(domain)"
-			EndGroup
-		EndGroup
-		LocateLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]].*"
-		BeginGroupIfNoLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]]*webmaster@$(domain)[[:blank:]]*$"
-			ReplaceLineWith "ServerAdmin webmaster@$(domain)"
-		EndGroup
-		#
-		# Make space for cfengine hacks
-		#
-		# (Try to add it _before_ virtual hosts)
-		#
-		ResetSearch "1"
-		BeginGroupIfNoSuchLine "# BEGIN CFENGINE"
-			BeginGroupIfNoLineMatching "^(### Section 3: Virtual Hosts|#?NameVirtualHost.*|#?VirtualHost.*)$"
-				Append ""
-				Append "# BEGIN CFENGINE"
-				Append "# END CFENGINE"
-			EndGroup
-			BeginGroupIfNoLineMatching "^# BEGIN CFENGINE$"
-				LocateLineMatching "^(### Section 3: Virtual Hosts|#?NameVirtualHost.*|#?VirtualHost.*)$"
-				IncrementPointer "-1"
-				InsertLine ""
-				InsertLine "# BEGIN CFENGINE"
-				InsertLine "# END CFENGINE"
-				InsertLine ""
-			EndGroup
-		EndGroup
-		#
-		# LoadModule php3_module /usr/lib/apache/1.3/libphp3.so
-		#
-		# <IfModule libphp3.c>
-		# 	php3_display_errors off
-		#	php3_log_errors on
-		#	AddType application/x-httpd-php3 .php3
-		#	AddType application/x-httpd-php3-source .phps
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/libphp3.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+php3_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+php3_module[[:blank:]]+/usr/lib/apache/1.3/libphp3.so$"
-			ReplaceLineWith "LoadModule php3_module /usr/lib/apache/1.3/libphp3.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule libphp3.c>"
-				InsertLine "<IfModule libphp3.c>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule libphp3.c>$"
-			BeginGroupIfNoLineMatching "[[:blank:]]*php3_display_errors off"
-				InsertLine "	php3_display_errors off"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*php3_log_errors on"
-				InsertLine "	php3_log_errors on"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*AddType application/x-httpd-php3 .php3"
-				InsertLine "	AddType application/x-httpd-php3 .php3"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*AddType application/x-httpd-source .phps"
-				InsertLine "	AddType application/x-httpd-source .phps"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule php4_module /usr/lib/apache/1.3/libphp4.so
-		#
-		# <IfModule libphp4.c>
-		# 	php_flag display_errors off
-		#	php_flag log_errors on
-		#	AddType application/x-httpd-php .phtml .php .inc .php3
-		#	AddType application/x-httpd-php-source .phps
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/libphp4.so"
-			ResetSearch "1"
-#			UnCommentLinesMatching "^\#[[:blank:]]*LoadModule[[:blank:]]+php4\_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+php4\_module[[:blank:]]+/usr/lib/apache/1.3/libphp4.so$"
-			ReplaceLineWith "LoadModule php4_module /usr/lib/apache/1.3/libphp4.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule libphp4.c>"
-				InsertLine "<IfModule libphp4.c>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule libphp4.c>$"
-			BeginGroupIfNoLineMatching "^.*php_flag[[:blank:]]*display_errors[[:blank:]]*off$"
-				InsertLine "	php_flag display_errors off"
-			EndGroup
-			BeginGroupIfNoLineMatching ".*php_flag log_errors on"
-				InsertLine "	php_flag log_errors on"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*AddType application/x-httpd-php .phtml .php .inc .php3"
-				InsertLine "	AddType application/x-httpd-php .phtml .php .inc .php3"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*AddType application/x-httpd-source .phps"
-				InsertLine "	AddType application/x-httpd-source .phps"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule gzip_module /usr/lib/apache/1.3/mod_gzip.so
-		#
-		# <IfModule mod_gzip.c>
-		#	mod_gzip_dechunk yes
-		#	mod_gzip_keep_workfiles No
-		#	mod_gzip_temp_dir /tmp
-		#	mod_gzip_minimum_file_size 1002
-		#	mod_gzip_maximum_file_size 0
-		#	mod_gzip_maximum_inmem_size 1000000
-		#	mod_gzip_item_include file "\.htm$"
-		#	mod_gzip_item_include file "\.html$"
-		#	mod_gzip_item_include mime "text/.*"
-		#	mod_gzip_item_include file "\.php$"
-		#	mod_gzip_item_include mime "jserv-servlet"
-		#	mod_gzip_item_include handler "jserv-servlet"
-		#	mod_gzip_item_include mime "application/x-httpd-php.*"
-		#	mod_gzip_item_include mime "httpd/unix-directory"
-		#	mod_gzip_item_exclude file "\.css$"
-		#	mod_gzip_item_exclude file "\.js$"
-		#	mod_gzip_item_exclude file "\.wml$"
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_gzip.so"
-			ResetSearch "1"
-#			SetCommentStart "#"
-#			SetCommentEnd ""
-#			UnCommentLinesMatching "^\#[[:blank:]]*LoadModule[[:blank:]]+gzip_module[[:blank:]].*"
-			LocateLineMatching "#[[:blank:]]*LoadModule[[:blank:]]+gzip_module[[:blank:]]+/usr/lib/apache/1.3/mod_gzip.so"
-#			UnCommentNLines "1"
-			ReplaceLineWith "LoadModule gzip_module /usr/lib/apache/1.3/mod_gzip.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_gzip.c>"
-				InsertLine "<IfModule mod_gzip.c>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_gzip.c>$"
-			BeginGroupIfNoLineMatching '	mod_gzip_on yes'
-				InsertLine '	mod_gzip_on yes'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_dechunk yes'
-				InsertLine '	mod_gzip_dechunk yes'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_keep_workfiles No'
-				InsertLine '	mod_gzip_keep_workfiles No'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_temp_dir /tmp'
-				InsertLine '	mod_gzip_temp_dir /tmp'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_minimum_file_size 1002'
-				InsertLine '	mod_gzip_minimum_file_size 1002'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_maximum_file_size 0'
-				InsertLine '	mod_gzip_maximum_file_size 0'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_maximum_inmem_size 1000000'
-				InsertLine '	mod_gzip_maximum_inmem_size 1000000'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include file "\\\.htm\$"'
-				InsertLine '	mod_gzip_item_include file "\.htm$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include file "\\\.html\$"'
-				InsertLine '	mod_gzip_item_include file "\.html$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include mime "text/\.\*"'
-				InsertLine '	mod_gzip_item_include mime "text/.*"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include file "\\\.php\$"'
-				InsertLine '	mod_gzip_item_include file "\.php$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include mime "jserv-servlet"'
-				InsertLine '	mod_gzip_item_include mime "jserv-servlet"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include handler "jserv-servlet"'
-				InsertLine '	mod_gzip_item_include handler "jserv-servlet"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include mime "application/x-httpd-php\.\*"'
-				InsertLine '	mod_gzip_item_include mime "application/x-httpd-php.*"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include mime "httpd/unix-directory"'
-				InsertLine '	mod_gzip_item_include mime "httpd/unix-directory"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_exclude file "\\\.css\$"'
-				InsertLine '	mod_gzip_item_exclude file "\.css$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_exclude file "\\\.js\$"'
-				InsertLine '	mod_gzip_item_exclude file "\.js$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_exclude file "\\\.wml\$"'
-				InsertLine '	mod_gzip_item_exclude file "\.wml$"'
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule index_rss_module /usr/lib/apache/1.3/mod_index_rss.so
-		#
-		# <IfModule mod_index_rss.c>
-		# 	IndexRSSEngine On
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_index_rss.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+index_rss_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+index_rss_module[[:blank:]]+/usr/lib/apache/1.3/mod_index_rss.so$"
-			ReplaceLineWith "LoadModule index_rss_module /usr/lib/apache/1.3/mod_index_rss.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_index_rss.c>"
-				InsertLine "<IfModule mod_index_rss.c>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_index_rss.c>$"
-			BeginGroupIfNoLineMatching "[[:blank:]]+IndexRSSEngine On"
-				InsertLine "	IndexRSSEngine On"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule pam_auth_module /usr/lib/apache/1.3/mod_auth_pam.so
-		#
-		# <IfModule mod_auth_pam.c>
-		# 	<Location />
-		# 		AuthPAM_Enabled Off
-		# 	</Location>
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_auth_pam.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+pam_auth_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+pam_auth_module[[:blank:]]+/usr/lib/apache/1.3/mod_auth_pam.so$"
-			ReplaceLineWith "LoadModule pam_auth_module /usr/lib/apache/1.3/mod_auth_pam.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_auth_pam.c>"
-				InsertLine "<IfModule mod_auth_pam.c>"
-				InsertLine "	<Location />"
-				InsertLine "	</Location>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_auth_pam.c>$"
-			LocateLineMatching "[[:blank:]]+<Location />"
-			BeginGroupIfNoLineMatching "[[:blank:]]+AuthPAM_Enabled Off"
-				InsertLine "		AuthPAM_Enabled Off"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule authshadow_module /usr/lib/apache/1.3/mod_auth_shadow.so
-		#
-		# <IfModule mod_auth_shadow.c>
-		# 	<Location />
-		# 		AuthShadow Off
-		# 	</Location>
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_auth_shadow.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+authshadow_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+authshadow_module[[:blank:]]+/usr/lib/apache/1.3/mod_auth_shadow.so$"
-			ReplaceLineWith "LoadModule authshadow_module /usr/lib/apache/1.3/mod_auth_shadow.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_auth_shadow.c>"
-				InsertLine "<IfModule mod_auth_shadow.c>"
-				InsertLine "	<Location />"
-				InsertLine "	</Location>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_auth_shadow.c>$"
-			LocateLineMatching "[[:blank:]]+<Location />"
-			BeginGroupIfNoLineMatching "[[:blank:]]+AuthShadow Off"
-				InsertLine "		AuthShadow Off"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule xslt_module /usr/lib/apache/1.3/mod_xslt.so
-		#
-		# <IfModule mod_xslt.c>
-		# 	<Location /xslt>
-		# 		AddHandler mod_xslt .html
-		# 		AddHandler mod_xslt .txt
-		# 	</Location>
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_xslt.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+xslt_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+xslt_module[[:blank:]]+/usr/lib/apache/1.3/mod_xslt.so$"
-			ReplaceLineWith "LoadModule xslt_module /usr/lib/apache/1.3/mod_xslt.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_xslt.c>"
-				InsertLine "<IfModule mod_xslt.c>"
-				InsertLine "	<Location /xslt>"
-				InsertLine "	</Location>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_xslt.c>$"
-			LocateLineMatching "[[:blank:]]+<Location /xslt>"
-			BeginGroupIfNoLineMatching "[[:blank:]]+AddHandler mod_xslt .html"
-				InsertLine "		AddHandler mod_xslt .html"
-				InsertLine "		AddHandler mod_xslt .txt"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# SSLCACertificatePath /etc/ssl/certs
-		# SSLCACertificateFile /etc/ssl/certs/cacert.pem
-		# SSLCertificateFile apache.pem
-		# SSLCertificateKeyFile apache.pem
-		#
-		ResetSearch "1"
-		HashCommentLinesMatching "SSLCACertificatePath*"
-		CatchAbort
-		BeginGroupIfFileExists "/etc/ssl/certs/cacert.pem"
-			ResetSearch "1"
-			HashCommentLinesMatching "SSLCACertificatePath*"
-			CatchAbort
-			ResetSearch "1"
-			HashCommentLinesMatching "SSLCACertificateFile*"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "SSLCACertificatePath /etc/ssl/certs"
-				InsertLine "SSLCACertificatePath /etc/ssl/certs"
-				InsertLine "SSLCACertificateFile /etc/ssl/certs/cacert.pem"
-			EndGroup
-			ResetSearch "1"
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		BeginGroupIfFileExists "/etc/ssl/certs/apache.pem"
-			ResetSearch "1"
-			HashCommentLinesMatching "SSLCertificateFile*"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "SSLCertificateFile apache.pem"
-				InsertLine "SSLCertificateFile apache.pem"
-			EndGroup
-			ResetSearch "1"
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		BeginGroupIfFileExists "/etc/ssl/private/apache.pem"
-			ResetSearch "1"
-			HashCommentLinesMatching "SSLCertificateKeyFile*"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "SSLCertificateKeyFile apache.pem"
-				InsertLine "SSLCertificateKeyFile apache.pem"
-			EndGroup
-			ResetSearch "1"
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-	}
-processes:
-	"apache_ssl"	restart "/etc/init.d/apache-ssl restart"
-shellcommands:
-    apache_reload::
-	"/etc/init.d/apache-ssl force-reload"
diff --git a/apache/apache.cf b/apache/apache.cf
deleted file mode 100755
index 1f4143b..0000000
--- a/apache/apache.cf
+++ /dev/null
@@ -1,357 +0,0 @@
-#! /usr/bin/cfengine -qf
-
-control:
-	OutputPrefix	= ("${cf_prefix}")
-	actionsequence	= ( editfiles shellcommands processes )
-	AddInstallable	= ( apache_reload )
-	EditfileSize	= ( 50000 )
-
-editfiles:
-    any::
-	{ /etc/apache/httpd.conf
-		DefineClasses "apache_reload"
-		#
-		# ServerAdmin webmaster@$(domain)
-		#
-		# (Try to add it _before_ virtual hosts)
-		#
-		WarnIfNoLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]].*"
-		BeginGroupIfNoLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]].*"
-			BeginGroupIfNoLineMatching "^(### Section 3: Virtual Hosts|#?NameVirtualHost.*|#?VirtualHost.*)$"
-				Append "ServerAdmin webmaster@$(domain)"
-			EndGroup
-			BeginGroupIfNoLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]].*"
-				LocateLineMatching "^(### Section 3: Virtual Hosts|#?NameVirtualHost.*|#?VirtualHost.*)$"
-				InsertLine "ServerAdmin webmaster@$(domain)"
-			EndGroup
-		EndGroup
-		LocateLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]].*"
-		BeginGroupIfNoLineMatching "^[[:blank:]]*ServerAdmin[[:blank:]]*webmaster@$(domain)[[:blank:]]*$"
-			ReplaceLineWith "ServerAdmin webmaster@$(domain)"
-		EndGroup
-		#
-		# Make space for cfengine hacks
-		#
-		# (Try to add it _before_ virtual hosts)
-		#
-		ResetSearch "1"
-		BeginGroupIfNoSuchLine "# BEGIN CFENGINE"
-			BeginGroupIfNoLineMatching "^(### Section 3: Virtual Hosts|#?NameVirtualHost.*|#?VirtualHost.*)$"
-				Append ""
-				Append "# BEGIN CFENGINE"
-				Append "# END CFENGINE"
-			EndGroup
-			BeginGroupIfNoLineMatching "^# BEGIN CFENGINE$"
-				LocateLineMatching "^(### Section 3: Virtual Hosts|#?NameVirtualHost.*|#?VirtualHost.*)$"
-				IncrementPointer "-1"
-				InsertLine ""
-				InsertLine "# BEGIN CFENGINE"
-				InsertLine "# END CFENGINE"
-				InsertLine ""
-			EndGroup
-		EndGroup
-		#
-		# LoadModule php3_module /usr/lib/apache/1.3/libphp3.so
-		#
-		# <IfModule libphp3.c>
-		# 	php3_display_errors off
-		#	php3_log_errors on
-		#	AddType application/x-httpd-php3 .php3
-		#	AddType application/x-httpd-php3-source .phps
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/libphp3.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+php3_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+php3_module[[:blank:]]+/usr/lib/apache/1.3/libphp3.so$"
-			ReplaceLineWith "LoadModule php3_module /usr/lib/apache/1.3/libphp3.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule libphp3.c>"
-				InsertLine "<IfModule libphp3.c>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule libphp3.c>$"
-			BeginGroupIfNoLineMatching "[[:blank:]]*php3_display_errors off"
-				InsertLine "	php3_display_errors off"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*php3_log_errors on"
-				InsertLine "	php3_log_errors on"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*AddType application/x-httpd-php3 .php3"
-				InsertLine "	AddType application/x-httpd-php3 .php3"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*AddType application/x-httpd-source .phps"
-				InsertLine "	AddType application/x-httpd-source .phps"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule php4_module /usr/lib/apache/1.3/libphp4.so
-		#
-		# <IfModule libphp4.c>
-		# 	php_flag display_errors off
-		#	php_flag log_errors on
-		#	AddType application/x-httpd-php .phtml .php .inc .php3
-		#	AddType application/x-httpd-php-source .phps
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/libphp4.so"
-			ResetSearch "1"
-#			UnCommentLinesMatching "^\#[[:blank:]]*LoadModule[[:blank:]]+php4\_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+php4\_module[[:blank:]]+/usr/lib/apache/1.3/libphp4.so$"
-			ReplaceLineWith "LoadModule php4_module /usr/lib/apache/1.3/libphp4.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule libphp4.c>"
-				InsertLine "<IfModule libphp4.c>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule libphp4.c>$"
-			BeginGroupIfNoLineMatching "^.*php_flag[[:blank:]]*display_errors[[:blank:]]*off$"
-				InsertLine "	php_flag display_errors off"
-			EndGroup
-			BeginGroupIfNoLineMatching ".*php_flag log_errors on"
-				InsertLine "	php_flag log_errors on"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*AddType application/x-httpd-php .phtml .php .inc .php3"
-				InsertLine "	AddType application/x-httpd-php .phtml .php .inc .php3"
-			EndGroup
-			BeginGroupIfNoLineMatching "[[:blank:]]*AddType application/x-httpd-source .phps"
-				InsertLine "	AddType application/x-httpd-source .phps"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule gzip_module /usr/lib/apache/1.3/mod_gzip.so
-		#
-		# <IfModule mod_gzip.c>
-		#	mod_gzip_dechunk yes
-		#	mod_gzip_keep_workfiles No
-		#	mod_gzip_temp_dir /tmp
-		#	mod_gzip_minimum_file_size 1002
-		#	mod_gzip_maximum_file_size 0
-		#	mod_gzip_maximum_inmem_size 1000000
-		#	mod_gzip_item_include file "\.htm$"
-		#	mod_gzip_item_include file "\.html$"
-		#	mod_gzip_item_include mime "text/.*"
-		#	mod_gzip_item_include file "\.php$"
-		#	mod_gzip_item_include mime "jserv-servlet"
-		#	mod_gzip_item_include handler "jserv-servlet"
-		#	mod_gzip_item_include mime "application/x-httpd-php.*"
-		#	mod_gzip_item_include mime "httpd/unix-directory"
-		#	mod_gzip_item_exclude file "\.css$"
-		#	mod_gzip_item_exclude file "\.js$"
-		#	mod_gzip_item_exclude file "\.wml$"
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_gzip.so"
-			ResetSearch "1"
-#			SetCommentStart "#"
-#			SetCommentEnd ""
-#			UnCommentLinesMatching "^\#[[:blank:]]*LoadModule[[:blank:]]+gzip_module[[:blank:]].*"
-			LocateLineMatching "#[[:blank:]]*LoadModule[[:blank:]]+gzip_module[[:blank:]]+/usr/lib/apache/1.3/mod_gzip.so"
-#			UnCommentNLines "1"
-			ReplaceLineWith "LoadModule gzip_module /usr/lib/apache/1.3/mod_gzip.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_gzip.c>"
-				InsertLine "<IfModule mod_gzip.c>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_gzip.c>$"
-			BeginGroupIfNoLineMatching '	mod_gzip_on yes'
-				InsertLine '	mod_gzip_on yes'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_dechunk yes'
-				InsertLine '	mod_gzip_dechunk yes'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_keep_workfiles No'
-				InsertLine '	mod_gzip_keep_workfiles No'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_temp_dir /tmp'
-				InsertLine '	mod_gzip_temp_dir /tmp'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_minimum_file_size 1002'
-				InsertLine '	mod_gzip_minimum_file_size 1002'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_maximum_file_size 0'
-				InsertLine '	mod_gzip_maximum_file_size 0'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_maximum_inmem_size 1000000'
-				InsertLine '	mod_gzip_maximum_inmem_size 1000000'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include file "\\\.htm\$"'
-				InsertLine '	mod_gzip_item_include file "\.htm$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include file "\\\.html\$"'
-				InsertLine '	mod_gzip_item_include file "\.html$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include mime "text/\.\*"'
-				InsertLine '	mod_gzip_item_include mime "text/.*"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include file "\\\.php\$"'
-				InsertLine '	mod_gzip_item_include file "\.php$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include mime "jserv-servlet"'
-				InsertLine '	mod_gzip_item_include mime "jserv-servlet"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include handler "jserv-servlet"'
-				InsertLine '	mod_gzip_item_include handler "jserv-servlet"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include mime "application/x-httpd-php\.\*"'
-				InsertLine '	mod_gzip_item_include mime "application/x-httpd-php.*"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_include mime "httpd/unix-directory"'
-				InsertLine '	mod_gzip_item_include mime "httpd/unix-directory"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_exclude file "\\\.css\$"'
-				InsertLine '	mod_gzip_item_exclude file "\.css$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_exclude file "\\\.js\$"'
-				InsertLine '	mod_gzip_item_exclude file "\.js$"'
-			EndGroup
-			BeginGroupIfNoLineMatching '[[:blank:]]*mod_gzip_item_exclude file "\\\.wml\$"'
-				InsertLine '	mod_gzip_item_exclude file "\.wml$"'
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule index_rss_module /usr/lib/apache/1.3/mod_index_rss.so
-		#
-		# <IfModule mod_index_rss.c>
-		# 	IndexRSSEngine On
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_index_rss.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+index_rss_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+index_rss_module[[:blank:]]+/usr/lib/apache/1.3/mod_index_rss.so$"
-			ReplaceLineWith "LoadModule index_rss_module /usr/lib/apache/1.3/mod_index_rss.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_index_rss.c>"
-				InsertLine "<IfModule mod_index_rss.c>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_index_rss.c>$"
-			BeginGroupIfNoLineMatching "[[:blank:]]+IndexRSSEngine On"
-				InsertLine "	IndexRSSEngine On"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule pam_auth_module /usr/lib/apache/1.3/mod_auth_pam.so
-		#
-		# <IfModule mod_auth_pam.c>
-		# 	<Location />
-		# 		AuthPAM_Enabled Off
-		# 	</Location>
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_auth_pam.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+pam_auth_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+pam_auth_module[[:blank:]]+/usr/lib/apache/1.3/mod_auth_pam.so$"
-			ReplaceLineWith "LoadModule pam_auth_module /usr/lib/apache/1.3/mod_auth_pam.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_auth_pam.c>"
-				InsertLine "<IfModule mod_auth_pam.c>"
-				InsertLine "	<Location />"
-				InsertLine "	</Location>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_auth_pam.c>$"
-			LocateLineMatching "[[:blank:]]+<Location />"
-			BeginGroupIfNoLineMatching "[[:blank:]]+AuthPAM_Enabled Off"
-				InsertLine "		AuthPAM_Enabled Off"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule authshadow_module /usr/lib/apache/1.3/mod_auth_shadow.so
-		#
-		# <IfModule mod_auth_shadow.c>
-		# 	<Location />
-		# 		AuthShadow Off
-		# 	</Location>
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_auth_shadow.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+authshadow_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+authshadow_module[[:blank:]]+/usr/lib/apache/1.3/mod_auth_shadow.so$"
-			ReplaceLineWith "LoadModule authshadow_module /usr/lib/apache/1.3/mod_auth_shadow.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_auth_shadow.c>"
-				InsertLine "<IfModule mod_auth_shadow.c>"
-				InsertLine "	<Location />"
-				InsertLine "	</Location>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_auth_shadow.c>$"
-			LocateLineMatching "[[:blank:]]+<Location />"
-			BeginGroupIfNoLineMatching "[[:blank:]]+AuthShadow Off"
-				InsertLine "		AuthShadow Off"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-		#
-		# LoadModule authshadow_module /usr/lib/apache/1.3/mod_xslt.so
-		#
-		# <IfModule mod_auth_shadow.c>
-		# 	<Location /xslt>
-		# 		AddHandler mod_xslt .html
-		# 		AddHandler mod_xslt .txt
-		# 	</Location>
-		# </IfModule>
-		#
-		BeginGroupIfFileExists "/usr/lib/apache/1.3/mod_auth_shadow.so"
-			ResetSearch "1"
-# bug!			UnCommentLinesMatching "^#[[:blank:]]*LoadModule[[:blank:]]+authshadow_module[[:blank:]].*"
-			LocateLineMatching "^#[[:blank:]]*LoadModule[[:blank:]]+authshadow_module[[:blank:]]+/usr/lib/apache/1.3/mod_auth_shadow.so$"
-			ReplaceLineWith "LoadModule authshadow_module /usr/lib/apache/1.3/mod_auth_shadow.so"
-			CatchAbort
-			AbortAtLineMatching "^# END CFENGINE$"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			BeginGroupIfNoSuchLine "<IfModule mod_auth_shadow.c>"
-				InsertLine "<IfModule mod_auth_shadow.c>"
-				InsertLine "	<Location />"
-				InsertLine "	</Location>"
-				InsertLine "</IfModule>"
-			EndGroup
-			ResetSearch "1"
-			LocateLineMatching "^# BEGIN CFENGINE$"
-			LocateLineMatching "^<IfModule mod_auth_shadow.c>$"
-			LocateLineMatching "[[:blank:]]+<Location />"
-			BeginGroupIfNoLineMatching "[[:blank:]]+AuthShadow Off"
-				InsertLine "		AuthShadow Off"
-			EndGroup
-			UnsetAbort "^# END CFENGINE$"
-		EndGroup
-	}
-processes:
-	"apache"	restart "/etc/init.d/apache restart"
-shellcommands:
-    apache_reload::
-	"/etc/init.d/apache force-reload"
diff --git a/apache/include.d/README b/apache/include.d/README
deleted file mode 100644
index 4fc9840..0000000
--- a/apache/include.d/README
+++ /dev/null
@@ -1,8 +0,0 @@
-# These are example files for misc. tweaks to Apache.
-#
-# Add this line just above "Section 3: Virtual hosts" in httpd.conf:
-#
-# Include includes.d/
-#
-# TODO:
-#  * automate using CFEngine
diff --git a/apache/include.d/htfiles b/apache/include.d/htfiles
deleted file mode 100644
index 52c50c8..0000000
--- a/apache/include.d/htfiles
+++ /dev/null
@@ -1,4 +0,0 @@
-<Files ~ "^\.ht">
-	Order allow,deny
-	Deny from all
-</Files>
diff --git a/apache/include.d/index.anything b/apache/include.d/index.anything
deleted file mode 100644
index 972639b..0000000
--- a/apache/include.d/index.anything
+++ /dev/null
@@ -1,3 +0,0 @@
-<IfModule mod_dir.c>
-    DirectoryIndex index.html index.htm index.shtml index.cgi index.php home.htm
-</IfModule>
diff --git a/apache/include.d/log-vhosts b/apache/include.d/log-vhosts
deleted file mode 100644
index de2ae41..0000000
--- a/apache/include.d/log-vhosts
+++ /dev/null
@@ -1,4 +0,0 @@
-LogFormat "[ %v %{%Y %m %d}t ] %h %l %u %t \"%r\" %>s %b" CustomLog
-LogFormat "[ %v %{%Y %m %d}t ] %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" CustomLog_combined
-#CustomLog "|/usr/local/bin/parselog" CustomLog
-CustomLog "|/usr/local/bin/parselog" CustomLog_combined
diff --git a/apache/includes/ErrorDocument b/apache/includes/ErrorDocument
deleted file mode 100644
index 7b62626..0000000
--- a/apache/includes/ErrorDocument
+++ /dev/null
@@ -1,22 +0,0 @@
-Alias /ErrorDocument/ /var/www/COMMON/ErrorDocument/
-
-# "400 Bad Request"
-# "401 Authorization Required"
-# "403 Forbidden"
-# "404 Not Found"
-# "406 Not Acceptible"
-# "500 Internal Server Error"
-#ErrorDocument 400 /ErrorDocument/400
-ErrorDocument 401 /ErrorDocument/401
-ErrorDocument 403 /ErrorDocument/403
-ErrorDocument 404 /ErrorDocument/404
-#ErrorDocument 406 /Errordocument/406
-ErrorDocument 500 /ErrorDocument/500
-
-<Directory /var/www/COMMON/ErrorDocument>
-	Options +MultiViews +Includes
-	AddType text/html .shtml
-	AddHandler server-parsed .shtml
-	order allow,deny
-	allow from all
-</Directory>
diff --git a/apache/includes/ServerSignature b/apache/includes/ServerSignature
deleted file mode 100644
index fc9a7e9..0000000
--- a/apache/includes/ServerSignature
+++ /dev/null
@@ -1 +0,0 @@
-ServerSignature Email
diff --git a/apache/includes/misc b/apache/includes/misc
deleted file mode 100644
index 52667db..0000000
--- a/apache/includes/misc
+++ /dev/null
@@ -1,47 +0,0 @@
-ScriptAlias /mailman /usr/lib/mailman/cgi-bin
-Alias /pipermail /var/lib/mailman/archives/public
-Alias /Lists-Archives /var/lib/mailman/archives/public
-
-Alias /pub/ /pub/
-Alias /debian/ /pub/debian/
-Alias /debian-non-US/ /pub/debian-non-US/
-
-Alias /twig/ /usr/share/twig/
-Alias /twig-test/ /var/www/COMMON/twig/twig-test/
-Alias /aeromail/ /var/www/COMMON/aeromail/aeromail-active/
-Alias /mumail/ /var/www/COMMON/mumail/mumail-active/
-Alias /wapmail/ /var/www/COMMON/wapmail/wapmail-active/
-Alias /wapmail-test/ /var/www/COMMON/wapmail/wapmail-test/
-Alias /horde /usr/share/horde
-Alias /imp /usr/share/horde/imp
-
-Alias /terminal /var/www/COMMON/mindterm/mindterm-active
-Alias /mindterm/ /var/www/COMMON/mindterm/mindterm-active/
-Alias /mindterm-test/ /var/www/COMMON/mindterm/mindterm-test/
-Alias /jta/ /var/www/COMMON/jta/jta-active/
-
-Alias /drall/ /var/www/COMMON/drall/drall-active/
-Alias /drall-test/ /var/www/COMMON/drall/drall-test/
-
-Alias /ldapxp/ /var/www/COMMON/ldapxp/ldapxp-active/
-Alias /ldapxp-test/ /var/www/COMMON/ldapxp/ldapxp-test/
-
-Alias /ldapexplorer/ /var/www/COMMON/ldapexplorer/ldapexplorer-active/
-Alias /ldapexplorer-test/ /var/www/COMMON/ldapexplorer/ldapexplorer-test/
-
-Alias /sldapa/ /var/www/COMMON/sldapa/sldapa-active/
-Alias /sldapa-test/ /var/www/COMMON/sldapa/sldapa-test/
-
-Alias /web2ldap/ /var/www/COMMON/web2ldap/web2ldap-active/
-Alias /web2ldap-test/ /var/www/COMMON/web2ldap/web2ldap-test/
-
-Alias /chat /var/www/COMMON/jirc/jirc-active
-Alias /jirc/ /var/www/COMMON/jirc/jirc-active/
-Alias /eirc/ /var/www/COMMON/eirc/eirc-active/
-Alias /apirc/ /var/www/COMMON/apirc/apirc-active/
-Alias /phpirc/ /var/www/COMMON/phpirc/phpirc-active/
-Alias /phpchat/ /var/www/COMMON/phpchat/phpchat-active/
-Alias /whiplash/ /var/www/COMMON/whiplash/whiplash-active/
-
-Alias /rosenet-calendar/ /var/www/COMMON/rosenet-calendar/rosenet-calendar-active/
-Alias /webcal/ /var/www/COMMON/webcal/webcal-active/
diff --git a/apache/includes/misc-php4 b/apache/includes/misc-php4
deleted file mode 100644
index 51c9ab6..0000000
--- a/apache/includes/misc-php4
+++ /dev/null
@@ -1,52 +0,0 @@
-ScriptAlias /mailman /usr/lib/mailman/cgi-bin
-Alias /pipermail /var/lib/mailman/archives/public
-Alias /Lists-Archives /var/lib/mailman/archives/public
-
-Alias /pub/ /pub/
-Alias /debian/ /pub/debian/
-Alias /debian-non-US/ /pub/debian-non-US/
-
-Alias /squirrelmail/ /var/www/COMMON/squirrelmail/squirrelmail-active/
-Alias /squirrelmail-test/ /var/www/COMMON/squirrelmail/squirrelmail-test/
-Alias /nocc/ /var/www/COMMON/nocc/nocc-active/
-Alias /twig/ /usr/share/twig/
-Alias /twig-test/ /var/www/COMMON/twig/twig-test/
-Alias /aeromail/ /var/www/COMMON/aeromail/aeromail-active/
-Alias /mumail/ /var/www/COMMON/mumail/mumail-active/
-Alias /wapmail/ /var/www/COMMON/wapmail/wapmail-active/
-Alias /wapmail-test/ /var/www/COMMON/wapmail/wapmail-test/
-Alias /horde /usr/share/horde
-Alias /imp /usr/share/horde/imp
-
-Alias /terminal /var/www/COMMON/mindterm/mindterm-active
-Alias /mindterm/ /var/www/COMMON/mindterm/mindterm-active/
-Alias /mindterm-test/ /var/www/COMMON/mindterm/mindterm-test/
-Alias /jta/ /var/www/COMMON/jta/jta-active/
-
-Alias /drall/ /var/www/COMMON/drall/drall-active/
-Alias /drall-test/ /var/www/COMMON/drall/drall-test/
-
-Alias /ldapxp/ /var/www/COMMON/ldapxp/ldapxp-active/
-Alias /ldapxp-test/ /var/www/COMMON/ldapxp/ldapxp-test/
-
-Alias /ldapexplorer/ /var/www/COMMON/ldapexplorer/ldapexplorer-active/
-Alias /ldapexplorer-test/ /var/www/COMMON/ldapexplorer/ldapexplorer-test/
-
-Alias /sldapa/ /var/www/COMMON/sldapa/sldapa-active/
-Alias /sldapa-test/ /var/www/COMMON/sldapa/sldapa-test/
-
-Alias /web2ldap/ /var/www/COMMON/web2ldap/web2ldap-active/
-Alias /web2ldap-test/ /var/www/COMMON/web2ldap/web2ldap-test/
-
-Alias /chat /var/www/COMMON/jirc/jirc-active
-Alias /jirc/ /var/www/COMMON/jirc/jirc-active/
-Alias /eirc/ /var/www/COMMON/eirc/eirc-active/
-Alias /apirc/ /var/www/COMMON/apirc/apirc-active/
-Alias /phpirc/ /var/www/COMMON/phpirc/phpirc-active/
-Alias /phpchat/ /var/www/COMMON/phpchat/phpchat-active/
-Alias /whiplash/ /var/www/COMMON/whiplash/whiplash-active/
-
-Alias /rosenet-calendar/ /var/www/COMMON/rosenet-calendar/rosenet-calendar-active/
-Alias /webcal/ /var/www/COMMON/webcal/webcal-active/
-
-Alias /user-admin /var/www/COMMON/user-admin
diff --git a/apache/includes/nocc b/apache/includes/nocc
deleted file mode 100644
index e0aa7ec..0000000
--- a/apache/includes/nocc
+++ /dev/null
@@ -1,2 +0,0 @@
-Alias /nocc/ /var/www/COMMON/nocc/nocc-active/
-Alias /nocc-test/ /var/www/COMMON/nocc/nocc-test/
diff --git a/apache/includes/user-admin b/apache/includes/user-admin
deleted file mode 100644
index 2c468dc..0000000
--- a/apache/includes/user-admin
+++ /dev/null
@@ -1,13 +0,0 @@
-Alias /user-admin /var/www/COMMON/user-admin
-
-<Location /user-admin>
-	Options +MultiViews +Indexes
-	DirectoryIndex index
-
-	AuthShadow On
-	AuthName "User admin"
-	AuthType Basic
-	<Limit GET POST>
-		require valid-user
-	</Limit>
-</Location>
diff --git a/apache/mksuexec/Makefile b/apache/mksuexec/Makefile
deleted file mode 100644
index 2e1bd79..0000000
--- a/apache/mksuexec/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-suexec-home:
-	gcc -lm -lcrypt -ldb -ldl -I/usr/include/apache-1.3 -DAP_DOC_ROOT=/home -o suexec-home suexec.c
-
-suexec2-prefork-home:
-	gcc -lm -lcrypt -ldb -ldl -I/usr/include/apache2 -I/usr/include/apr-0 -DAP_DOC_ROOT=/home -o suexec-prefork-home suexec.c
diff --git a/apache/mksuexec/suexec.c b/apache/mksuexec/suexec.c
deleted file mode 100644
index af67ad5..0000000
--- a/apache/mksuexec/suexec.c
+++ /dev/null
@@ -1,620 +0,0 @@
-/* Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * suexec.c -- "Wrapper" support program for suEXEC behaviour for Apache
- *
- ***********************************************************************
- *
- * NOTE! : DO NOT edit this code!!!  Unless you know what you are doing,
- *         editing this code might open up your system in unexpected 
- *         ways to would-be crackers.  Every precaution has been taken 
- *         to make this code as safe as possible; alter it at your own
- *         risk.
- *
- ***********************************************************************
- *
- *
- */
-
-#include "apr.h"
-#include "ap_config.h"
-#include "suexec.h"
-
-#define AP_DOC_ROOT "/home"
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <string.h>
-#include <time.h>
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-
-/*
- ***********************************************************************
- * There is no initgroups() in QNX, so I believe this is safe :-)
- * Use cc -osuexec -3 -O -mf -DQNX suexec.c to compile.
- *
- * May 17, 1997.
- * Igor N. Kovalenko -- infoh@mail.wplus.net
- ***********************************************************************
- */
-
-#if defined(NEED_INITGROUPS)
-int initgroups(const char *name, gid_t basegid)
-{
-    /* QNX and MPE do not appear to support supplementary groups. */
-    return 0;
-}
-#endif
-
-#if defined(SUNOS4)
-extern char *sys_errlist[];
-#define strerror(x) sys_errlist[(x)]
-#endif
-
-#if defined(PATH_MAX)
-#define AP_MAXPATH PATH_MAX
-#elif defined(MAXPATHLEN)
-#define AP_MAXPATH MAXPATHLEN
-#else
-#define AP_MAXPATH 8192
-#endif
-
-#define AP_ENVBUF 256
-
-extern char **environ;
-static FILE *log = NULL;
-
-char *safe_env_lst[] =
-{
-    /* variable name starts with */
-    "HTTP_",
-    "SSL_",
-
-    /* variable name is */
-    "AUTH_TYPE=",
-    "CONTENT_LENGTH=",
-    "CONTENT_TYPE=",
-    "DATE_GMT=",
-    "DATE_LOCAL=",
-    "DOCUMENT_NAME=",
-    "DOCUMENT_PATH_INFO=",
-    "DOCUMENT_ROOT=",
-    "DOCUMENT_URI=",
-    "FILEPATH_INFO=",
-    "GATEWAY_INTERFACE=",
-    "HTTPS=",
-    "LAST_MODIFIED=",
-    "PATH_INFO=",
-    "PATH_TRANSLATED=",
-    "QUERY_STRING=",
-    "QUERY_STRING_UNESCAPED=",
-    "REMOTE_ADDR=",
-    "REMOTE_HOST=",
-    "REMOTE_IDENT=",
-    "REMOTE_PORT=",
-    "REMOTE_USER=",
-    "REDIRECT_QUERY_STRING=",
-    "REDIRECT_REMOTE_USER=",
-    "REDIRECT_STATUS=",
-    "REDIRECT_URL=",
-    "REQUEST_METHOD=",
-    "REQUEST_URI=",
-    "SCRIPT_FILENAME=",
-    "SCRIPT_NAME=",
-    "SCRIPT_URI=",
-    "SCRIPT_URL=",
-    "SERVER_ADMIN=",
-    "SERVER_NAME=",
-    "SERVER_ADDR=",
-    "SERVER_PORT=",
-    "SERVER_PROTOCOL=",
-    "SERVER_SIGNATURE=",
-    "SERVER_SOFTWARE=",
-    "UNIQUE_ID=",
-    "USER_NAME=",
-    "TZ=",
-    NULL
-};
-
-
-static void err_output(const char *fmt, va_list ap)
-{
-#ifdef AP_LOG_EXEC
-    time_t timevar;
-    struct tm *lt;
-
-    if (!log) {
-        if ((log = fopen(AP_LOG_EXEC, "a")) == NULL) {
-            fprintf(stderr, "failed to open log file\n");
-            perror("fopen");
-            exit(1);
-        }
-    }
-
-    time(&timevar);
-    lt = localtime(&timevar);
-
-    fprintf(log, "[%d-%.2d-%.2d %.2d:%.2d:%.2d]: ",
-            lt->tm_year + 1900, lt->tm_mon + 1, lt->tm_mday,
-            lt->tm_hour, lt->tm_min, lt->tm_sec);
-
-    vfprintf(log, fmt, ap);
-
-    fflush(log);
-#endif /* AP_LOG_EXEC */
-    return;
-}
-
-static void log_err(const char *fmt,...)
-{
-#ifdef AP_LOG_EXEC
-    va_list ap;
-
-    va_start(ap, fmt);
-    err_output(fmt, ap);
-    va_end(ap);
-#endif /* AP_LOG_EXEC */
-    return;
-}
-
-static void clean_env(void)
-{
-    char pathbuf[512];
-    char **cleanenv;
-    char **ep;
-    int cidx = 0;
-    int idx;
-
-    /* While cleaning the environment, the environment should be clean.
-     * (e.g. malloc() may get the name of a file for writing debugging info.
-     * Bad news if MALLOC_DEBUG_FILE is set to /etc/passwd.  Sprintf() may be
-     * susceptible to bad locale settings....)
-     * (from PR 2790)
-     */
-    char **envp = environ;
-    char *empty_ptr = NULL;
- 
-    environ = &empty_ptr; /* VERY safe environment */
-
-    if ((cleanenv = (char **) calloc(AP_ENVBUF, sizeof(char *))) == NULL) {
-        log_err("failed to malloc memory for environment\n");
-        exit(120);
-    }
-
-    sprintf(pathbuf, "PATH=%s", AP_SAFE_PATH);
-    cleanenv[cidx] = strdup(pathbuf);
-    cidx++;
-
-    for (ep = envp; *ep && cidx < AP_ENVBUF-1; ep++) {
-        for (idx = 0; safe_env_lst[idx]; idx++) {
-            if (!strncmp(*ep, safe_env_lst[idx],
-                         strlen(safe_env_lst[idx]))) {
-                cleanenv[cidx] = *ep;
-                cidx++;
-                break;
-            }
-        }
-    }
-
-    cleanenv[cidx] = NULL;
-
-    environ = cleanenv;
-}
-
-int main(int argc, char *argv[])
-{
-    int userdir = 0;        /* ~userdir flag             */
-    uid_t uid;              /* user information          */
-    gid_t gid;              /* target group placeholder  */
-    char *target_uname;     /* target user name          */
-    char *target_gname;     /* target group name         */
-    char *target_homedir;   /* target home directory     */
-    char *actual_uname;     /* actual user name          */
-    char *actual_gname;     /* actual group name         */
-    char *prog;             /* name of this program      */
-    char *cmd;              /* command to be executed    */
-    char cwd[AP_MAXPATH];   /* current working directory */
-    char dwd[AP_MAXPATH];   /* docroot working directory */
-    struct passwd *pw;      /* password entry holder     */
-    struct group *gr;       /* group entry holder        */
-    struct stat dir_info;   /* directory info holder     */
-    struct stat prg_info;   /* program info holder       */
-
-    /*
-     * Start with a "clean" environment
-     */
-    clean_env();
-
-    prog = argv[0];
-    /*
-     * Check existence/validity of the UID of the user
-     * running this program.  Error out if invalid.
-     */
-    uid = getuid();
-    if ((pw = getpwuid(uid)) == NULL) {
-        log_err("crit: invalid uid: (%ld)\n", uid);
-        exit(102);
-    }
-    /*
-     * See if this is a 'how were you compiled' request, and
-     * comply if so.
-     */
-    if ((argc > 1)
-        && (! strcmp(argv[1], "-V"))
-        && ((uid == 0)
-#ifdef _OSD_POSIX
-        /* User name comparisons are case insensitive on BS2000/OSD */
-            || (! strcasecmp(AP_HTTPD_USER, pw->pw_name)))
-#else  /* _OSD_POSIX */
-            || (! strcmp(AP_HTTPD_USER, pw->pw_name)))
-#endif /* _OSD_POSIX */
-        ) {
-#ifdef AP_DOC_ROOT
-        fprintf(stderr, " -D AP_DOC_ROOT=\"%s\"\n", AP_DOC_ROOT);
-#endif
-#ifdef AP_GID_MIN
-        fprintf(stderr, " -D AP_GID_MIN=%d\n", AP_GID_MIN);
-#endif
-#ifdef AP_HTTPD_USER
-        fprintf(stderr, " -D AP_HTTPD_USER=\"%s\"\n", AP_HTTPD_USER);
-#endif
-#ifdef AP_LOG_EXEC
-        fprintf(stderr, " -D AP_LOG_EXEC=\"%s\"\n", AP_LOG_EXEC);
-#endif
-#ifdef AP_SAFE_PATH
-        fprintf(stderr, " -D AP_SAFE_PATH=\"%s\"\n", AP_SAFE_PATH);
-#endif
-#ifdef AP_SUEXEC_UMASK
-        fprintf(stderr, " -D AP_SUEXEC_UMASK=%03o\n", AP_SUEXEC_UMASK);
-#endif
-#ifdef AP_UID_MIN
-        fprintf(stderr, " -D AP_UID_MIN=%d\n", AP_UID_MIN);
-#endif
-#ifdef AP_USERDIR_SUFFIX
-        fprintf(stderr, " -D AP_USERDIR_SUFFIX=\"%s\"\n", AP_USERDIR_SUFFIX);
-#endif
-        exit(0);
-    }
-    /*
-     * If there are a proper number of arguments, set
-     * all of them to variables.  Otherwise, error out.
-     */
-    if (argc < 4) {
-        log_err("too few arguments\n");
-        exit(101);
-    }
-    target_uname = argv[1];
-    target_gname = argv[2];
-    cmd = argv[3];
-
-    /*
-     * Check to see if the user running this program
-     * is the user allowed to do so as defined in
-     * suexec.h.  If not the allowed user, error out.
-     */
-#ifdef _OSD_POSIX
-    /* User name comparisons are case insensitive on BS2000/OSD */
-    if (strcasecmp(AP_HTTPD_USER, pw->pw_name)) {
-        log_err("user mismatch (%s instead of %s)\n", pw->pw_name, AP_HTTPD_USER);
-        exit(103);
-    }
-#else  /*_OSD_POSIX*/
-    if (strcmp(AP_HTTPD_USER, pw->pw_name)) {
-        log_err("user mismatch (%s instead of %s)\n", pw->pw_name, AP_HTTPD_USER);
-        exit(103);
-    }
-#endif /*_OSD_POSIX*/
-
-    /*
-     * Check for a leading '/' (absolute path) in the command to be executed,
-     * or attempts to back up out of the current directory,
-     * to protect against attacks.  If any are
-     * found, error out.  Naughty naughty crackers.
-     */
-    if ((cmd[0] == '/') || (!strncmp(cmd, "../", 3))
-        || (strstr(cmd, "/../") != NULL)) {
-        log_err("invalid command (%s)\n", cmd);
-        exit(104);
-    }
-
-    /*
-     * Check to see if this is a ~userdir request.  If
-     * so, set the flag, and remove the '~' from the
-     * target username.
-     */
-    if (!strncmp("~", target_uname, 1)) {
-        target_uname++;
-        userdir = 1;
-    }
-
-    /*
-     * Error out if the target username is invalid.
-     */
-    if (strspn(target_uname, "1234567890") != strlen(target_uname)) {
-        if ((pw = getpwnam(target_uname)) == NULL) {
-            log_err("invalid target user name: (%s)\n", target_uname);
-            exit(105);
-        }
-    }
-    else {
-        if ((pw = getpwuid(atoi(target_uname))) == NULL) {
-            log_err("invalid target user id: (%s)\n", target_uname);
-            exit(121);
-        }
-    }
-
-    /*
-     * Error out if the target group name is invalid.
-     */
-    if (strspn(target_gname, "1234567890") != strlen(target_gname)) {
-        if ((gr = getgrnam(target_gname)) == NULL) {
-            log_err("invalid target group name: (%s)\n", target_gname);
-            exit(106);
-        }
-        gid = gr->gr_gid;
-        actual_gname = strdup(gr->gr_name);
-    }
-    else {
-        gid = atoi(target_gname);
-        actual_gname = strdup(target_gname);
-    }
-
-#ifdef _OSD_POSIX
-    /*
-     * Initialize BS2000 user environment
-     */
-    {
-        pid_t pid;
-        int status;
-
-        switch (pid = ufork(target_uname)) {
-        case -1:    /* Error */
-            log_err("failed to setup bs2000 environment for user %s: %s\n",
-                    target_uname, strerror(errno));
-            exit(150);
-        case 0:     /* Child */
-            break;
-        default:    /* Father */
-            while (pid != waitpid(pid, &status, 0))
-                ;
-            /* @@@ FIXME: should we deal with STOP signals as well? */
-            if (WIFSIGNALED(status)) {
-                kill (getpid(), WTERMSIG(status));
-            }
-            exit(WEXITSTATUS(status));
-        }
-    }
-#endif /*_OSD_POSIX*/
-    
-    /*
-     * Save these for later since initgroups will hose the struct
-     */
-    uid = pw->pw_uid;
-    actual_uname = strdup(pw->pw_name);
-    target_homedir = strdup(pw->pw_dir);
-
-    /*
-     * Log the transaction here to be sure we have an open log 
-     * before we setuid().
-     */
-    log_err("uid: (%s/%s) gid: (%s/%s) cmd: %s\n",
-            target_uname, actual_uname,
-            target_gname, actual_gname,
-            cmd);
-
-    /*
-     * Error out if attempt is made to execute as root or as
-     * a UID less than AP_UID_MIN.  Tsk tsk.
-     */
-    if ((uid == 0) || (uid < AP_UID_MIN)) {
-        log_err("cannot run as forbidden uid (%d/%s)\n", uid, cmd);
-        exit(107);
-    }
-
-    /*
-     * Error out if attempt is made to execute as root group
-     * or as a GID less than AP_GID_MIN.  Tsk tsk.
-     */
-    if ((gid == 0) || (gid < AP_GID_MIN)) {
-        log_err("cannot run as forbidden gid (%d/%s)\n", gid, cmd);
-        exit(108);
-    }
-
-    /*
-     * Change UID/GID here so that the following tests work over NFS.
-     *
-     * Initialize the group access list for the target user,
-     * and setgid() to the target group. If unsuccessful, error out.
-     */
-    if (((setgid(gid)) != 0) || (initgroups(actual_uname, gid) != 0)) {
-        log_err("failed to setgid (%ld: %s)\n", gid, cmd);
-        exit(109);
-    }
-
-    /*
-     * setuid() to the target user.  Error out on fail.
-     */
-    if ((setuid(uid)) != 0) {
-        log_err("failed to setuid (%ld: %s)\n", uid, cmd);
-        exit(110);
-    }
-
-    /*
-     * Get the current working directory, as well as the proper
-     * document root (dependant upon whether or not it is a
-     * ~userdir request).  Error out if we cannot get either one,
-     * or if the current working directory is not in the docroot.
-     * Use chdir()s and getcwd()s to avoid problems with symlinked
-     * directories.  Yuck.
-     */
-    if (getcwd(cwd, AP_MAXPATH) == NULL) {
-        log_err("cannot get current working directory\n");
-        exit(111);
-    }
-
-    if (userdir) {
-        if (((chdir(target_homedir)) != 0) ||
-            ((chdir(AP_USERDIR_SUFFIX)) != 0) ||
-            ((getcwd(dwd, AP_MAXPATH)) == NULL) ||
-            ((chdir(cwd)) != 0)) {
-            log_err("cannot get docroot information (%s)\n", target_homedir);
-            exit(112);
-        }
-    }
-    else {
-        if (((chdir(AP_DOC_ROOT)) != 0) ||
-            ((getcwd(dwd, AP_MAXPATH)) == NULL) ||
-            ((chdir(cwd)) != 0)) {
-            log_err("cannot get docroot information (%s)\n", AP_DOC_ROOT);
-            exit(113);
-        }
-    }
-
-    if ((strncmp(cwd, dwd, strlen(dwd))) != 0) {
-        log_err("command not in docroot (%s/%s)\n", cwd, cmd);
-        exit(114);
-    }
-
-    /*
-     * Stat the cwd and verify it is a directory, or error out.
-     */
-    if (((lstat(cwd, &dir_info)) != 0) || !(S_ISDIR(dir_info.st_mode))) {
-        log_err("cannot stat directory: (%s)\n", cwd);
-        exit(115);
-    }
-
-    /*
-     * Error out if cwd is writable by others.
-     */
-    if ((dir_info.st_mode & S_IWOTH) || (dir_info.st_mode & S_IWGRP)) {
-        log_err("directory is writable by others: (%s)\n", cwd);
-        exit(116);
-    }
-
-    /*
-     * Error out if we cannot stat the program.
-     */
-    if (((lstat(cmd, &prg_info)) != 0) || (S_ISLNK(prg_info.st_mode))) {
-        log_err("cannot stat program: (%s)\n", cmd);
-        exit(117);
-    }
-
-    /*
-     * Error out if the program is writable by others.
-     */
-    if ((prg_info.st_mode & S_IWOTH) || (prg_info.st_mode & S_IWGRP)) {
-        log_err("file is writable by others: (%s/%s)\n", cwd, cmd);
-        exit(118);
-    }
-
-    /*
-     * Error out if the file is setuid or setgid.
-     */
-    if ((prg_info.st_mode & S_ISUID) || (prg_info.st_mode & S_ISGID)) {
-        log_err("file is either setuid or setgid: (%s/%s)\n", cwd, cmd);
-        exit(119);
-    }
-
-    /*
-     * Error out if the target name/group is different from
-     * the name/group of the cwd or the program.
-     */
-    if ((uid != dir_info.st_uid) ||
-        (gid != dir_info.st_gid) ||
-        (uid != prg_info.st_uid) ||
-        (gid != prg_info.st_gid)) {
-        log_err("target uid/gid (%ld/%ld) mismatch "
-                "with directory (%ld/%ld) or program (%ld/%ld)\n",
-                uid, gid,
-                dir_info.st_uid, dir_info.st_gid,
-                prg_info.st_uid, prg_info.st_gid);
-        exit(120);
-    }
-    /*
-     * Error out if the program is not executable for the user.
-     * Otherwise, she won't find any error in the logs except for
-     * "[error] Premature end of script headers: ..."
-     */
-    if (!(prg_info.st_mode & S_IXUSR)) {
-        log_err("file has no execute permission: (%s/%s)\n", cwd, cmd);
-        exit(121);
-    }
-
-#ifdef AP_SUEXEC_UMASK
-    /*
-     * umask() uses inverse logic; bits are CLEAR for allowed access.
-     */
-    if ((~AP_SUEXEC_UMASK) & 0022) {
-        log_err("notice: AP_SUEXEC_UMASK of %03o allows "
-                "write permission to group and/or other\n", AP_SUEXEC_UMASK);
-    }
-    umask(AP_SUEXEC_UMASK);
-#endif /* AP_SUEXEC_UMASK */
-
-    /* 
-     * Be sure to close the log file so the CGI can't
-     * mess with it.  If the exec fails, it will be reopened 
-     * automatically when log_err is called.  Note that the log
-     * might not actually be open if AP_LOG_EXEC isn't defined.
-     * However, the "log" cell isn't ifdef'd so let's be defensive
-     * and assume someone might have done something with it
-     * outside an ifdef'd AP_LOG_EXEC block.
-     */
-    if (log != NULL) {
-        fclose(log);
-        log = NULL;
-    }
-
-    /*
-     * Execute the command, replacing our image with its own.
-     */
-#ifdef NEED_HASHBANG_EMUL
-    /* We need the #! emulation when we want to execute scripts */
-    {
-        extern char **environ;
-
-        ap_execve(cmd, &argv[3], environ);
-    }
-#else /*NEED_HASHBANG_EMUL*/
-    execv(cmd, &argv[3]);
-#endif /*NEED_HASHBANG_EMUL*/
-
-    /*
-     * (I can't help myself...sorry.)
-     *
-     * Uh oh.  Still here.  Where's the kaboom?  There was supposed to be an
-     * EARTH-shattering kaboom!
-     *
-     * Oh well, log the failure and error out.
-     */
-    log_err("(%d)%s: exec failed (%s)\n", errno, strerror(errno), cmd);
-    exit(255);
-}
diff --git a/apache/mksuexec/suexec.c.diff b/apache/mksuexec/suexec.c.diff
deleted file mode 100644
index 48adf9e..0000000
--- a/apache/mksuexec/suexec.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- suexec.c.orig	2004-08-23 17:07:18.000000000 +0200
-+++ suexec.c	2004-12-29 00:30:26.000000000 +0100
-@@ -33,6 +33,8 @@
- #include "ap_config.h"
- #include "suexec.h"
- 
-+#define AP_DOC_ROOT "/home"
-+
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/apache/mksuexec/suexec.h b/apache/mksuexec/suexec.h
deleted file mode 100644
index e76a3bb..0000000
--- a/apache/mksuexec/suexec.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 1999-2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * suexec.h -- user-definable variables for the suexec wrapper code.
- *             (See README.configure on how to customize these variables.)
- */
-
-
-#ifndef _SUEXEC_H
-#define _SUEXEC_H
-
-/*
- * Include ap_config_layout so we can work out where the default htdocsdir
- * and logsdir are.
- */
-#include "ap_config_layout.h"
-
-/*
- * HTTPD_USER -- Define as the username under which Apache normally
- *               runs.  This is the only user allowed to execute
- *               this program.
- */
-#ifndef AP_HTTPD_USER
-#define AP_HTTPD_USER "www"
-#endif
-
-/*
- * UID_MIN -- Define this as the lowest UID allowed to be a target user
- *            for suEXEC.  For most systems, 500 or 100 is common.
- */
-#ifndef AP_UID_MIN
-#define AP_UID_MIN 100
-#endif
-
-/*
- * GID_MIN -- Define this as the lowest GID allowed to be a target group
- *            for suEXEC.  For most systems, 100 is common.
- */
-#ifndef AP_GID_MIN
-#define AP_GID_MIN 100
-#endif
-
-/*
- * USERDIR_SUFFIX -- Define to be the subdirectory under users' 
- *                   home directories where suEXEC access should
- *                   be allowed.  All executables under this directory
- *                   will be executable by suEXEC as the user so 
- *                   they should be "safe" programs.  If you are 
- *                   using a "simple" UserDir directive (ie. one 
- *                   without a "*" in it) this should be set to 
- *                   the same value.  suEXEC will not work properly
- *                   in cases where the UserDir directive points to 
- *                   a location that is not the same as the user's
- *                   home directory as referenced in the passwd file.
- *
- *                   If you have VirtualHosts with a different
- *                   UserDir for each, you will need to define them to
- *                   all reside in one parent directory; then name that
- *                   parent directory here.  IF THIS IS NOT DEFINED
- *                   PROPERLY, ~USERDIR CGI REQUESTS WILL NOT WORK!
- *                   See the suEXEC documentation for more detailed
- *                   information.
- */
-#ifndef AP_USERDIR_SUFFIX
-#define AP_USERDIR_SUFFIX "public_html"
-#endif
-
-/*
- * LOG_EXEC -- Define this as a filename if you want all suEXEC
- *             transactions and errors logged for auditing and
- *             debugging purposes.
- */
-#ifndef AP_LOG_EXEC
-#define AP_LOG_EXEC DEFAULT_EXP_LOGFILEDIR "/suexec_log" /* Need me? */
-#endif
-
-/*
- * DOC_ROOT -- Define as the DocumentRoot set for Apache.  This
- *             will be the only hierarchy (aside from UserDirs)
- *             that can be used for suEXEC behavior.
- */
-#ifndef AP_DOC_ROOT
-#define AP_DOC_ROOT DEFAULT_EXP_HTDOCSDIR
-#endif
-
-/*
- * SAFE_PATH -- Define a safe PATH environment to pass to CGI executables.
- *
- */
-#ifndef AP_SAFE_PATH
-#define AP_SAFE_PATH "/usr/local/bin:/usr/bin:/bin"
-#endif
-
-#endif /* _SUEXEC_H */
diff --git a/apache/vhosts.d/00Virtual b/apache/vhosts.d/00Virtual
deleted file mode 100644
index 9a7bf64..0000000
--- a/apache/vhosts.d/00Virtual
+++ /dev/null
@@ -1,17 +0,0 @@
-DocumentRoot		/home
-
-<Directory /home/*/websites/*>
-    AllowOverride FileInfo AuthConfig Limit
-    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-    <Limit GET POST OPTIONS PROPFIND>
-        Order allow,deny
-        Allow from all
-    </Limit>
-    <Limit PUT DELETE PATCH PROPPATCH MKCOL COPY MOVE LOCK UNLOCK>
-        Order deny,allow
-        Deny from all
-    </Limit>
-</Directory>
-
-UseCanonicalName	Off
-NameVirtualHost		*
diff --git a/apache/vhosts.d/0DEFAULT b/apache/vhosts.d/0DEFAULT
deleted file mode 100644
index 364a825..0000000
--- a/apache/vhosts.d/0DEFAULT
+++ /dev/null
@@ -1,17 +0,0 @@
-<VirtualHost *>
-ServerName	107b.dk
-ServerAlias	www
-ServerAdmin	webmaster@107b.dk
-DocumentRoot	/home/web/websites/107b.dk
-
-ScriptAlias	/cgi-bin/ /home/web/webscripts/107b.dk/
-User		web
-Group		web
-</VirtualHost>
-
-<VirtualHost *>
-ServerName	www.107b.dk
-RewriteEngine	On
-RewriteRule	/ http://107b.dk/ [R]
-TransferLog	/dev/null
-</VirtualHost>
diff --git a/apache/vhosts.d/README b/apache/vhosts.d/README
deleted file mode 100644
index a07436e..0000000
--- a/apache/vhosts.d/README
+++ /dev/null
@@ -1,15 +0,0 @@
-# These are example files for Apache virtual hosts.
-# They need a little tweaking (at least change the domainname).
-#
-# Add this line just below "Section 3: Virtual hosts" in httpd.conf:
-#
-# Include vhosts.d/
-#
-# Some of the stuff is tied to the concept of recompiling suexec to have
-# the files located below /home instead of /var/www (this - among other
-# issues - allows for putting ftp access within a chroot and still allow
-# web designers into their websites).
-#
-# TODO:
-#  * Write these as m4 scripts
-#  * automate using CFEngine
diff --git a/apache/vhosts.d/admin b/apache/vhosts.d/admin
deleted file mode 100644
index bf1d0cb..0000000
--- a/apache/vhosts.d/admin
+++ /dev/null
@@ -1,43 +0,0 @@
-<VirtualHost *>
-ServerName	admin.107b.dk
-ServerAlias	admin
-ServerAdmin	webmaster@107b.dk
-DocumentRoot	/home/web/websites/admin.107b.dk
-
-Alias		/eskuel/ /var/www/eskuel/
-
-Alias		/dav/ /var/www/dav/
-<Location /dav/>
-	AuthShadow	On
-	AuthName	"WebDAV"
-	AuthType	Basic
-	AllowOverride	None
-	Dav		On
-	Options		Indexes
-	Order		allow,deny
-	Allow from all
-	<Limit HEAD GET POST OPTIONS PROPFIND>
-		Allow from all
-	</Limit>
-	<Limit MKCOL PUT DELETE LOCK UNLOCK COPY MOVE PROPPATCH>
-#		Deny from all
-		Allow from all
-	</Limit>
-	require valid-user
-</Location>
-
-Alias		/put/ /var/www/put/
-<Location /put/>
-	EnablePut	On
-#	EnableDelete Off
-	umask 007
-#	<Limit PUT>
-	AuthShadow	On
-	AuthName	"http PUT"
-	AuthType	Basic
-		require valid-user
-#	</Limit>
-</Location>
-
-Include /etc/phpmyadmin/apache.conf
-</VirtualHost>
diff --git a/apache/vhosts.d/cups b/apache/vhosts.d/cups
deleted file mode 100644
index f122b09..0000000
--- a/apache/vhosts.d/cups
+++ /dev/null
@@ -1,12 +0,0 @@
-<VirtualHost *>
-	ServerName	cups.107b.dk
-	RewriteEngine	On
-	RewriteRule	/ http://cups.107b.dk:631/ [R]
-	TransferLog	/dev/null
-</VirtualHost>
-<VirtualHost *>
-	ServerName	cups
-	RewriteEngine	On
-	RewriteRule	/ http://cups:631/ [R]
-	TransferLog	/dev/null
-</VirtualHost>
diff --git a/apache/vhosts.d/horde2 b/apache/vhosts.d/horde2
deleted file mode 100644
index f776794..0000000
--- a/apache/vhosts.d/horde2
+++ /dev/null
@@ -1,12 +0,0 @@
-<VirtualHost *>
-	ServerName	horde.vega.dk
-	ServerAlias	horde
-	ServerAlias	homebase.horde.vega.dk
-	ServerAlias	louiz.horde.vega.dk
-	ServerAlias	lab.horde.vega.dk
-	ServerAlias	jones.horde.vega.dk
-	ServerAlias     vega.horde.vega.dk
-	ServerAdmin     webmaster@vega.dk
-	DocumentRoot    /usr/share/horde2
-	Include		/etc/horde2/apache.conf
-</VirtualHost>
diff --git a/apache/vhosts.d/kiosk b/apache/vhosts.d/kiosk
deleted file mode 100644
index 8de507b..0000000
--- a/apache/vhosts.d/kiosk
+++ /dev/null
@@ -1,7 +0,0 @@
-<VirtualHost *>
-ServerName	kiosk.107b.dk
-ServerAlias	kiosk
-RewriteEngine	On
-RewriteRule	/ http://lab.107b.dk/ [R]
-TransferLog	/dev/null
-</VirtualHost>
diff --git a/apache/vhosts.d/mail b/apache/vhosts.d/mail
deleted file mode 100644
index 6a7e3bd..0000000
--- a/apache/vhosts.d/mail
+++ /dev/null
@@ -1,29 +0,0 @@
-<VirtualHost *>
-	ServerName	mail.107b.dk
-	ServerAlias	mail
-	ServerAdmin	webmaster@107b.dk
-	DocumentRoot	/home/web/websites/mail.107b.dk
-
-Alias /postaci/ /var/www/postaci/
-
-	Alias		/lists/archive /var/lib/mailman/archives/public
-	ScriptAlias	/lists /usr/lib/mailman/cgi-bin
-	ScriptAlias	/mailman /usr/lib/mailman/cgi-bin
-	RewriteEngine	on
-	RewriteRule	^/lists(/)?$ /lists/listinfo [R]
-
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-
-	<Location /doc/mailman/images/>
-		order deny,allow
-		allow from all
-	</Location>
-
-	Include /etc/horde/apache.conf
-	Include /etc/imp/apache.conf
-	Include /etc/squirrelmail/apache.conf
-#	Include /etc/sympa/httpd.conf-cgi
-</VirtualHost>
diff --git a/apache/vhosts.d/stats b/apache/vhosts.d/stats
deleted file mode 100644
index 1d0db6b..0000000
--- a/apache/vhosts.d/stats
+++ /dev/null
@@ -1,26 +0,0 @@
-<VirtualHost *>
-	ServerName	stats.vega.dk
-	ServerAlias	stats
-	ServerAdmin	webmaster@vega.dk
-	DocumentRoot	/home/jonas/websites/stats.vega.dk
-	Alias		/awstats-icon /usr/share/awstats/icon
-
-	<Location />
-		Options +Indexes +MultiViews +ExecCGI
-		DirectoryIndex index
-		ServerSignature Email
-	</Location>
-
-#	<Location /www.ror.dk/>
-#		AuthUserFile /var/www/VIRTUAL/stats.jones.dk/www/COMMON/.htpasswd
-#		AuthGroupFile /dev/null
-#		AuthType Basic
-#		AuthName "Stats access"
-#		require user jonas rordk
-#	</Location>
-
-	<Location /doc/analog/images>
-		order allow,deny
-		allow from all
-	</Location>
-</VirtualHost>
diff --git a/apache/vhosts.d/wiki b/apache/vhosts.d/wiki
deleted file mode 100644
index e4e026f..0000000
--- a/apache/vhosts.d/wiki
+++ /dev/null
@@ -1,12 +0,0 @@
-<VirtualHost *>
-	ServerName      wiki.vega.dk
-	ServerAlias	wiki
-	ServerAdmin     webmaster@vega.dk
-	DocumentRoot    /home/jonas/websites/wiki.vega.dk
-	user            jonas
-	group           jonas
-	Alias		/wiki/ /usr/share/moin/htdocs/
-	ScriptAlias	/moin /home/jonas/webscripts/wiki.vega.dk/moin.cgi
-	RewriteEngine	on
-	RewriteRule	^/$ /moin [R]
-</VirtualHost>
diff --git a/apache/vhosts.d/wpad b/apache/vhosts.d/wpad
deleted file mode 100644
index 847a676..0000000
--- a/apache/vhosts.d/wpad
+++ /dev/null
@@ -1,6 +0,0 @@
-<VirtualHost *>
-	ServerName	wpad
-	DocumentRoot	/etc/local-COMMON/apache/wpad
-	RewriteEngine	On
-	RewriteRule	^/.*$ /etc/local-COMMON/apache/wpad/wpad.dat [T=application/x-ns-proxy-autoconfig]
-</VirtualHost>
diff --git a/apache/vhosts.include.d/local-zope b/apache/vhosts.include.d/local-zope
deleted file mode 100644
index 7249ae5..0000000
--- a/apache/vhosts.include.d/local-zope
+++ /dev/null
@@ -1,6 +0,0 @@
-<Directory /var/lib/zope2.7/cgi-bin/>
-    AllowOverride None
-    Options ExecCGI
-    Order allow,deny
-    Allow from all
-</Directory>
diff --git a/apache/vhosts.m4/vhost.m4 b/apache/vhosts.m4/vhost.m4
deleted file mode 100644
index 072388e..0000000
--- a/apache/vhosts.m4/vhost.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated by vhost.m4 (please delete this line if editing manually!)
-ifdef(ROOT,
-<VirtualHost VHOST>
-	ServerName	HOST
-ifdef(HOST_LOCAL,
-	ServerAlias	HOST_LOCAL
-)dnl
-ifdef(HOST_JOKER,
-	ServerAlias	HOST_JOKER
-)dnl
-	ServerAdmin	EMAIL
-	DocumentRoot	ROOT
-ifdef(CGIROOT,
-	ScriptAlias	/cgi-bin/ CGIROOT
-	user		UID
-	group		GID
-)dnl
-</VirtualHost>
-)dnl
-ifdef(REDIRHOST,
-<VirtualHost VHOST>
-	ServerName	REDIRHOST
-ifdef(REDIRHOST_JOKER,
-	ServerAlias	*.REDIRHOST_JOKER
-)dnl
-	RewriteEngine	On
-	RewriteRule	/ http://HOST/ [R]
-	TransferLog	/dev/null
-</VirtualHost>
-)dnl
diff --git a/apache/virtual/VIRTUAL b/apache/virtual/VIRTUAL
deleted file mode 100644
index 1940715..0000000
--- a/apache/virtual/VIRTUAL
+++ /dev/null
@@ -1,38 +0,0 @@
-RewriteEngine On
-RewriteRule /VIRTUAL/([^/]+) http://$1 [R]
-RewriteCond %{HTTP_HOST} ^rip$ [NC]
-RewriteRule / http://rip:631/ [R,L]
-RewriteCond %{HTTP_HOST} ^proxy$ [NC]
-RewriteRule / http://rip:8080/ [R,L]
-
-#UseCanonicalName DNS
-UseCanonicalName Off
-
-NameVirtualHost *
-
-<VirtualHost _DEFAULT_>
-	DocumentRoot	/var/www
-	ScriptAlias	/cgi-local /var/www/cgi-local
-	<Location />
-		Options +ExecCGI
-		AuthPAM_Enabled On
-	</Location>
-	<Files bos*.cgi>
-		AuthType Basic
-		AuthName BOS
-		require group users
-	</Files>
-</VirtualHost>
-<VirtualHost *>
-	VirtualDocumentRoot	/var/www/VIRTUAL/%0/www
-	VirtualScriptAlias	/var/www/VIRTUAL/%0/cgi-local
-	<Location />
-		Options +ExecCGI
-		AuthPAM_Enabled On
-	</Location>
-	<Files bos*.cgi>
-		AuthType Basic
-		AuthName BOS
-		require group users
-	</Files>
-</VirtualHost>
diff --git a/apache/virtual/VIRTUAL-nopam b/apache/virtual/VIRTUAL-nopam
deleted file mode 100644
index 9eb0504..0000000
--- a/apache/virtual/VIRTUAL-nopam
+++ /dev/null
@@ -1,38 +0,0 @@
-RewriteEngine On
-RewriteRule /VIRTUAL/([^/]+) http://$1 [R]
-RewriteCond %{HTTP_HOST} ^rip$ [NC]
-RewriteRule / http://rip:631/ [R,L]
-RewriteCond %{HTTP_HOST} ^proxy$ [NC]
-RewriteRule / http://rip:8080/ [R,L]
-
-#UseCanonicalName DNS
-UseCanonicalName Off
-
-NameVirtualHost *
-
-<VirtualHost *>
-	VirtualDocumentRoot	/var/www/VIRTUAL/%0/www
-	VirtualScriptAlias	/var/www/VIRTUAL/%0/cgi-local
-	<Location />
-		Options +ExecCGI
-#		AuthPAM_Enabled On
-	</Location>
-	<Files bos*.cgi>
-		AuthType Basic
-		AuthName BOS
-		require group users
-	</Files>
-</VirtualHost>
-<VirtualHost _default_>
-	DocumentRoot	/var/www
-	ScriptAlias	/cgi-local /var/www/cgi-local
-	<Location />
-		Options +ExecCGI
-#		AuthPAM_Enabled On
-	</Location>
-	<Files bos*.cgi>
-		AuthType Basic
-		AuthName BOS
-		require group users
-	</Files>
-</VirtualHost>
diff --git a/apache/wpad/wpad.dat b/apache/wpad/wpad.dat
deleted file mode 100644
index e7b5574..0000000
--- a/apache/wpad/wpad.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-function FindProxyForURL(url, host)
-{
-return "PROXY proxy:3128 ; PROXY proxy:3128" ;
-}
-- 
cgit v1.2.3