From 34933c8cd635d7b2dc22fef4c2d6eb18737aec7f Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 17 Sep 2013 23:13:49 -0700
Subject: [PATCH] make_project: revert change that doesn't work with Apache 2.2

---
 db/schema_condor.sql | 7 +++++++
 tools/make_project   | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 db/schema_condor.sql

diff --git a/db/schema_condor.sql b/db/schema_condor.sql
new file mode 100644
index 0000000000..c3f53b6604
--- /dev/null
+++ b/db/schema_condor.sql
@@ -0,0 +1,7 @@
+create table batch_file_assoc (
+    job_file_id             integer         not null,
+    batch_id                integer         not null
+) engine=InnoDB;
+
+alter table batch_file_assoc
+    add unique(job_file_id, batch_id);
diff --git a/tools/make_project b/tools/make_project
index 5b3b54c5bf..99449ed2c4 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -321,7 +321,6 @@ print >>open(httpd_conf_template_filename,'w'), '''
     <Directory "%(proot)s/html">
         Options Indexes FollowSymlinks MultiViews
         AllowOverride AuthConfig
-        Require all granted
         Order allow,deny
         Allow from all
     </Directory>
@@ -329,7 +328,6 @@ print >>open(httpd_conf_template_filename,'w'), '''
     <Directory "%(proot)s/cgi-bin">
         Options ExecCGI
         AllowOverride AuthConfig
-        Require all granted
         Order allow,deny
         Allow from all
     </Directory>