Merge pull request #6 from 18F/ch/cf-deploy

Deployment of web server from web server

.env.deploy.sample

@@ -0,0 +1,5 @@
+
+SECRET_KEY: "dev-notify-secret-key"
+DANGEROUS_SALT: "dev-notify-salt"
+AWS_ACCESS_KEY_ID: <replace me>
+AWS_SECRET_ACCESS_KEY: <replace me>

app/cloudfoundry_config.py

@@ -6,7 +6,7 @@ def extract_cloudfoundry_config():
     vcap_services = json.loads(os.environ['VCAP_SERVICES'])
 
     # Postgres config
-    os.environ['SQLALCHEMY_DATABASE_URI'] = vcap_services['postgres'][0]['credentials']['uri'].replace('postgres',
-                                                                                                       'postgresql')
+    os.environ['SQLALCHEMY_DATABASE_URI'] = vcap_services['aws-rds'][0]['credentials']['uri'].replace('postgres',
+                                                                                                      'postgresql')
     # Redis config
-    os.environ['REDIS_URL'] = vcap_services['redis'][0]['credentials']['uri']
+    os.environ['REDIS_URL'] = vcap_services['aws-elasticache-redis'][0]['credentials']['uri']

app/config.py

@@ -530,7 +530,7 @@ class Staging(Config):
 
 
 class Live(Config):
-    NOTIFY_EMAIL_DOMAIN = 'notifications.service.gov.uk'
+    NOTIFY_EMAIL_DOMAIN = os.environ.get('NOTIFY_EMAIL_DOMAIN')
     NOTIFY_ENVIRONMENT = 'live'
     CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
     CONTACT_LIST_BUCKET_NAME = 'production-contact-list'

manifest.yml

@@ -0,0 +1,41 @@
+---
+
+applications:
+  - name: notifications-api
+    buildpack: python_buildpack
+    instances: 1
+    memory: 1G
+    disk_quota: 1G
+    health-check-type: process
+    health-check-invocation-timeout: 1
+    routes:
+    - route: notifications-api.app.cloud.gov
+
+    services:
+      - api-psql
+      - api-redis
+
+    env:
+      NOTIFY_APP_NAME: api
+      NOTIFY_LOG_PATH: /home/vcap/logs/app.log
+      FLASK_APP: application.py
+      FLASK_ENV: production
+
+      NOTIFY_ENVIRONMENT: live
+      API_HOST_NAME: notifications-api.app.cloud.gov
+      ADMIN_BASE_URL: notifications-admin.app.cloud.gov
+      NOTIFICATION_QUEUE_PREFIX: prototype_10x
+      STATSD_HOST: localhost
+      
+      # Credentials variables
+      DANGEROUS_SALT: ((DANGEROUS_SALT))
+      SECRET_KEY: ((SECRET_KEY))
+      AWS_REGION: us-west-2
+      AWS_PINPOINT_REGION: us-west-2
+      AWS_ACCESS_KEY_ID: ((AWS_ACCESS_KEY_ID))
+      AWS_SECRET_ACCESS_KEY: ((AWS_SECRET_ACCESS_KEY))
+      AWS_US_TOLL_FREE_NUMBER: +18446120782
+
+      DVLA_EMAIL_ADDRESSES: []
+
+      NOTIFY_EMAIL_DOMAIN: dispostable.com

sample.env

@@ -37,3 +37,5 @@ SQLALCHEMY_DATABASE_TEST_URI=postgresql://postgres:chummy@db:5432/test_notificat
 AWS_REGION=us-west-2
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
+AWS_PINPOINT_REGION=
+AWS_US_TOLL_FREE_NUMBER=