From 5dd16e14dd41f1565687142ba7cefa7c4cf64658 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Tue, 12 Nov 2013 13:39:41 +0100
Subject: wip

---
 test/data/my-webapp/root/conf/httpd.conf | 56 --------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 test/data/my-webapp/root/conf/httpd.conf

(limited to 'test/data/my-webapp/root/conf/httpd.conf')

diff --git a/test/data/my-webapp/root/conf/httpd.conf b/test/data/my-webapp/root/conf/httpd.conf
deleted file mode 100644
index 4a1e775..0000000
--- a/test/data/my-webapp/root/conf/httpd.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-ServerRoot ${BASEDIR}
-Mutex file:locks default
-PidFile ${APACHE_PID_FILE}
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 5
-
-#User ${APACHE_RUN_USER}
-#Group ${APACHE_RUN_GROUP}
-
-HostnameLookups Off
-ErrorLog logs/error.log
-LogLevel warn
-
-Include conf/modules.load
-Include conf/modules.conf
-
-Listen ${PORT}
-
-<IfModule mpm_prefork_module>
-  StartServers       5
-  MinSpareServers     5
-  MaxSpareServers    10
-  MaxRequestWorkers   150
-  MaxConnectionsPerChild   0
-</IfModule>
-
-<Directory />
-	Options FollowSymLinks
-	AllowOverride None
-	Require all denied
-</Directory>
-
-<Directory /var/www/>
-	Options Indexes FollowSymLinks
-	AllowOverride None
-	Require all granted
-</Directory>
-
-AccessFileName .htaccess
-
-<FilesMatch "^\.ht">
-	Require all denied
-</FilesMatch>
-
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-#IncludeOptional conf-enabled/*.conf
-#IncludeOptional sites-enabled/*.conf
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-- 
cgit v1.2.3