From 208f47e4e82703514a7e6802653b8d645d64bda7 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 24 Mar 2006 06:54:49 +0000
Subject: [PATCH] make_project

svn path=/trunk/boinc/; revision=9721
---
 checkin_notes      | 9 +++++++++
 tools/make_project | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 09289a9bce..ea96606e00 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3184,3 +3184,12 @@ David  23 Mar 2006
 
     client/
         app_control.C
+
+David  23 Mar 2006
+    - make_project:
+        - allow use of .htaccess in cgi-bin
+        - if --project_root is specified, put the key_dir there too
+    (from Eric Myers)
+
+    tools/
+        make_project
diff --git a/tools/make_project b/tools/make_project
index d38359bd20..098492c307 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -154,7 +154,7 @@ defopt('cgi_url'       , 'URL_BASE/PROJECT_cgi')
 
 defopt('user_name'     , USER, isdir=False)
 defopt('project_root'  , HOME+'/projects/PROJECT')
-defopt('key_dir'       , HOME+'/projects/PROJECT/keys')
+defopt('key_dir'       , options.project_root+'keys')
 
 defopt('db_name'       , 'PROJECT', isdir=False)
 defopt('db_user'       , 'USER_NAME', isdir=False)
@@ -163,12 +163,12 @@ defopt('db_host'       , '', isdir=False)
 
 print "Creating project '%s' (short name '%s'):" %(project_longname, project_shortname)
 for k in [
-    'key_dir',
     'project_root',
     'url_base',
     'html_user_url',
     'html_ops_url',
     'cgi_url',
+    'key_dir',
     'db_name',
     'db_host',
     ]:
@@ -241,6 +241,7 @@ print >>open(httpd_conf_template_filename,'w'), '''
 
     <Directory "%(proot)s/cgi-bin">
         Options ExecCGI
+        AllowOverride AuthConfig
         Order allow,deny
         Allow from all
     </Directory>