Merge pull request sc3#438 from bepetersn/master

Issue sc3#437; make corrections to nginx conf and scraper.sh
bepetersn · Jun 5, 2014 · c4b3f43 · c4b3f43
2 parents a6e60a2 + b7aa4b6
commit c4b3f43
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/config/nginx.conf.master b/config/nginx.conf.master
@@ -13,7 +13,7 @@ server {
         limit_except GET {
             deny all;
         }
-        root /home/ubuntu/website/scratch/scraper;
+        root /home/ubuntu/website;
         autoindex on;
         autoindex_exact_size off;
         autoindex_localtime on;

diff --git a/fabfile.py b/fabfile.py
@@ -126,10 +126,8 @@ def activate_cmd():
 
 
 def add_directories():
-    """
-    Adds directories if needed
-    """
-    dirs = [WEBSITE, WEBSITE + '/1.0/db_backups/']
+    """ Documents how to create requisite project directories. """
+    dirs = [WEBSITE, WEBSITE + '/1.0/db_backups/', WEBSITE + '/raw_inmate_data']
     for d in dirs:
         if not exists(d):
             run("mkdir -p '%s'" % d)

diff --git a/scripts/scraper.sh b/scripts/scraper.sh
@@ -21,8 +21,8 @@ DB_BACKUP_FILE=cookcountyjail-$(date +%Y-%m-%d).json
 SCRAPER_OPTIONS='--verbose'
 
 # export env variables related to raw inmate data
-export CCJ_RAW_INMATE_DATA_BUILD_DIR=${HOME}'/website/scraper/raw_inmate_data'
-export CCJ_RAW_INMATE_DATA_RELEASE_DIR=${CCJ_RAW_INMATE_DATA_BUILD_DIR}
+export CCJ_RAW_INMATE_DATA_BUILD_DIR=${HOME}'/website/scratch/scraper/raw_inmate_data'
+export CCJ_RAW_INMATE_DATA_RELEASE_DIR=${HOME}'/website/raw_inmate_data'
 export CCJ_STORE_RAW_INMATE_DATA=1
 
 # Bind in virtualenv settings