Updated start scripts to not look up envrionemnt

config.py

@@ -78,10 +78,23 @@ class Preview(Config):
     CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload'
 
 
+class Staging(Config):
+    SHOW_STYLEGUIDE = False
+    HTTP_PROTOCOL = 'https'
+    HEADER_COLOUR = '#F47738'  # $orange
+
+
+class Live(Config):
+    SHOW_STYLEGUIDE = False
+    HEADER_COLOUR = '#B10E1E'  # $red
+    HTTP_PROTOCOL = 'https'
+    HEADER_COLOUR = '#B10E1E'  # $red
+
+
 configs = {
     'development': 'config.Development',
     'test': 'config.Test',
     'preview': 'config.Preview',
-    'staging': 'config_staging.Staging',
-    'live': 'config_live.Live'
+    'staging': 'config.Staging',
+    'live': 'config.Live'
 }

config_live.py

@@ -1,17 +0,0 @@
-import os
-from config import Config
-
-
-class Live(Config):
-    SHOW_STYLEGUIDE = False
-    HEADER_COLOUR = '#B10E1E'  # $red
-    HTTP_PROTOCOL = 'https'
-    API_HOST_NAME = os.environ['LIVE_API_HOST_NAME']
-    ADMIN_CLIENT_SECRET = os.environ['LIVE_ADMIN_CLIENT_SECRET']
-    SECRET_KEY = os.environ['LIVE_SECRET_KEY']
-    DANGEROUS_SALT = os.environ['LIVE_DANGEROUS_SALT']
-    CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
-    DESKPRO_API_KEY = os.environ['LIVE_DESKPRO_API_KEY']
-    DESKPRO_DEPT_ID = os.environ['LIVE_DESKPRO_DEPT_ID']
-    DESKPRO_ASSIGNED_AGENT_TEAM_ID = os.environ['LIVE_DESKPRO_ASSIGNED_AGENT_TEAM_ID']
-    HEADER_COLOUR = '#B10E1E'  # $red

config_staging.py

@@ -1,16 +0,0 @@
-import os
-from config import Config
-
-
-class Staging(Config):
-    SHOW_STYLEGUIDE = False
-    HTTP_PROTOCOL = 'https'
-    API_HOST_NAME = os.environ['STAGING_API_HOST_NAME']
-    ADMIN_CLIENT_SECRET = os.environ['STAGING_ADMIN_CLIENT_SECRET']
-    SECRET_KEY = os.environ['STAGING_SECRET_KEY']
-    DANGEROUS_SALT = os.environ['STAGING_DANGEROUS_SALT']
-    CSV_UPLOAD_BUCKET_NAME = 'staging-notifications-csv-upload'
-    DESKPRO_API_KEY = os.environ['STAGING_DESKPRO_API_KEY']
-    DESKPRO_DEPT_ID = os.environ['STAGING_DESKPRO_DEPT_ID']
-    DESKPRO_ASSIGNED_AGENT_TEAM_ID = os.environ['STAGING_DESKPRO_ASSIGNED_AGENT_TEAM_ID']
-    HEADER_COLOUR = '#F47738'  # $orange

scripts/aws_change_ownership.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 echo "Chown application to be owned by ubuntu"
-cd /home/ubuntu/;
-chown -R ubuntu:ubuntu notifications-admin
+cd /home/notify-app/;
+chown -R notify-app:govuk-notify-applications notifications-admin

scripts/aws_install_dependencies.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 echo "Install dependencies"
-cd /home/ubuntu/notifications-admin;
-pip3 install -r /home/ubuntu/notifications-admin/requirements.txt
+cd /home/notify-app/notifications-admin;
+pip3 install -r /home/notify-app/notifications-admin/requirements.txt

wsgi.py

@@ -1,21 +1,9 @@
 from credstash import getAllSecrets
 import os
 
-default_env_file = '/home/ubuntu/environment'
-environment = 'live'
-
-if os.path.isfile(default_env_file):
-    with open(default_env_file, 'r') as environment_file:
-        environment = environment_file.readline().strip()
-
-
 # on aws get secrets and export to env
 os.environ.update(getAllSecrets(region="eu-west-1"))
 
-from config import configs  # noqa
-
-os.environ['NOTIFY_ADMIN_ENVIRONMENT'] = configs[environment]
-
 from app import create_app  # noqa
 
 application = create_app()