Env (#544)

* additional ebextensions for variables

* debug

* debug

* debug

* debug

* debug

* debug

Author: HenryMehta

Makefile

@@ -19,7 +19,10 @@ docker-db-populate:
 
 docker-test:
 	docker-compose exec web coverage run manage.py test --exclude=selenium
-	
+
+docker-score:
+	docker-compose exec web ./manage.py crontab_scoring
+
 docker-create-db:
 	docker-compose exec -it db bash 
 	psql -U postgres

webcdi/.ebextensions/02_initial.config

@@ -11,9 +11,9 @@ container_commands:
   04_create_log_dir_change_permissions:
     command: "mkdir -p /var/log/app && chmod g+s /var/log/app"
   05a_create_log_file_change_permissions:
-    command: "touch /var/log/app/django.log && chmod 664 /var/log/app/django.log"
+    command: "touch /var/log/app/django.log && chmod 666 /var/log/app/django.log"
   05b_create_log_file_change_permissions:
-    command: "touch /var/log/app/django_error.log && chmod 664 /var/log/app/django_error.log"
+    command: "touch /var/log/app/django_error.log && chmod 666 /var/log/app/django_error.log"
   07_log_dir_change_owner:
     command: "chown -R root:webapp /var/log/app"
 

webcdi/.ebextensions/04_environment.config

@@ -0,0 +1,6 @@
+commands:
+    setvars:
+        command: /opt/elasticbeanstalk/bin/get-config environment | jq -r 'to_entries | .[] | "export \(.key)=\"\(.value)\""' > /etc/profile.d/local.sh
+packages:
+    yum:
+        jq: []

webcdi/webcdi/settings.py

@@ -46,7 +46,15 @@ def get_secret(secret_name, region_name="us-west-2"):
     AWS_STORAGE_BUCKET_NAME = os.environ["AWS_STORAGE_BUCKET_NAME"]
     DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 
-ALLOWED_HOSTS = json.loads(os.environ["ALLOWED_HOSTS"])
+
+def json_or_string_to_list(var):
+    try:
+        return json.loads(var)
+    except Exception as e:
+        return var.replace('[','').replace(']','').split(',')
+
+
+ALLOWED_HOSTS = json_or_string_to_list(os.environ["ALLOWED_HOSTS"])
 if AWS_INSTANCE:
     ALLOWED_HOSTS += [
         "ec2-52-88-52-34.us-west-2.compute.amazonaws.com",
@@ -66,7 +74,7 @@ def get_secret(secret_name, region_name="us-west-2"):
 for IP in list(NEW_IPS):
     ALLOWED_HOSTS.append(IP)
 
-ADMINS = json.loads(os.environ["ADMINS"])
+ADMINS = json_or_string_to_list(os.environ["ADMINS"])
 
 DJANGO_SERVER_TYPE = os.environ.get("DJANGO_SERVER_TYPE", "DEV")  # DEV or PROD