I cleaned up our apache conf directory some. I split the django directives from the afe specific directives, pulled the require django stuff into the django directives (since it was silly to have 2 files that were so small), and pulled the main apache config out of the rest of the directives (but left a stub for compatability). For anyone building a larger apache config from these building blocks, these changes are pretty important.
From: jorlow@google.com
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2241 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/apache/apache-conf b/apache/apache-conf
new file mode 100644
index 0000000..d9b8e72
--- /dev/null
+++ b/apache/apache-conf
@@ -0,0 +1,26 @@
+NameVirtualHost *
+<VirtualHost *>
+ DocumentRoot /usr/local/autotest/apache/www/
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+ <Directory /usr/local/autotest/apache/www/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+
+
+ ErrorLog /var/log/apache2/error.log
+ LogLevel warn
+
+ CustomLog /var/log/apache2/access.log combined
+ ServerSignature On
+
+ RedirectMatch ^/$ /afe
+
+ Include "/usr/local/autotest/apache/conf/all-directives"
+
+</VirtualHost>