Correct scripts

Signed-off-by: James Noss <[email protected]>

.dockerignore

@@ -13,7 +13,7 @@ coverage.*
 __pycache__
 *.sqlite3
 db
-spectral_data
+array_data
 raw_data
 datasets
 log

.gitignore

@@ -170,7 +170,7 @@ cython_debug/
 
 # Project stuff
 raw_data/
-spectral_data/
+array_data/
 datasets/
 log/
 run/

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     restart: "no"
     volumes:
       - db-data:/app/db
-      - spectaldata-files:/app/spectral_data
+      - arraydata-files:/app/array_data
       - bulk-upload-files:/app/raw_data
       - spectaldata-files:/app/datasets
     environment:
@@ -28,7 +28,7 @@ services:
       && python manage.py migrate
       && python manage.py migrate --database=bsr
       && python manage.py loaddata centers queries
-      && python manage.py loaddata --database=bsr centers observables instruments qcannotators biosampletypes spectrameasurementtypes
+      && python manage.py loaddata --database=bsr centers observables instruments qcannotators biosampletypes arraymeasurementtypes
       && python manage.py update_sql_views flat_view
       && python manage.py crontab add
       && python manage.py prune_files
@@ -51,7 +51,7 @@ services:
       - 8000
     volumes:
       - db-data:/app/db
-      - spectaldata-files:/app/spectral_data
+      - arraydata-files:/app/array_data
       - bulk-upload-files:/app/raw_data
       - dataset-catalog-files:/app/datasets
       - static_files:/app/static
@@ -87,7 +87,7 @@ services:
       - "443:443"
     volumes:
       - static_files:/static
-      - spectaldata-files:/spectral_data
+      - arraydata-files:/array_data
       - bulk-upload-files:/raw_data
       - dataset-catalog-files:/datasets
     depends_on:
@@ -105,7 +105,7 @@ secrets:
 
 volumes:
   db-data:
-  spectaldata-files:
+  arraydata-files:
   bulk-upload-files:
   dataset-catalog-files:
   static_files:

nginx/nginx.conf

@@ -44,7 +44,7 @@ server {
         alias /raw_data/;
     }
 
-    location /spectral_data/ {
-        alias /spectral_data/;
+    location /array_data/ {
+        alias /array_data/;
     }
 }

scripts/dev/rebuild_postgres.sh

@@ -1,5 +1,5 @@
 # Delete uploaded data files.
-rm spectra_data/*
+rm array_data/*
 rm raw_data/*
 rm datasets/*
 
@@ -54,7 +54,7 @@ python manage.py migrate --database=bsr
 
 # Load initial data fixtures.
 python manage.py loaddata centers queries
-python manage.py loaddata --database=bsr centers observables instruments qcannotators biosampletypes spectrameasurementtypes
+python manage.py loaddata --database=bsr centers observables instruments qcannotators biosampletypes arraymeasurementtypes
 
 # Update SQL views.
 python manage.py update_sql_views flat_view

scripts/dev/rebuild_sqlite.sh

@@ -1,5 +1,5 @@
 # Delete uploaded data files.
-rm spectra_data/*
+rm array_data/*
 rm raw_data/*
 rm datasets/*
 
@@ -25,7 +25,7 @@ python manage.py migrate --database=bsr
 
 # Load initial data fixtures.
 python manage.py loaddata centers queries
-python manage.py loaddata --database=bsr centers observables instruments qcannotators biosampletypes spectrameasurementtypes
+python manage.py loaddata --database=bsr centers observables instruments qcannotators biosampletypes arraymeasurementtypes
 
 # Update SQL views.
 python manage.py update_sql_views flat_view

scripts/prd/deploy.sh

@@ -17,7 +17,7 @@ pipenv run python3 manage.py migrate --database=bsr
 # Don't do this on deployment so as not to clobber any live alterations. Instead, call these manually from the ec2
 # instance connected to the RDS instance.
 #pipenv run python3 manage.py loaddata centers queries
-#pipenv run python3 manage.py loaddata --database=bsr centers observables instruments qcannotators biosampletypes spectrameasurementtypes
+#pipenv run python3 manage.py loaddata --database=bsr centers observables instruments qcannotators biosampletypes arraymeasurementtypes
 
 # Update SQL views.
 pipenv run python3 manage.py update_sql_views flat_view