file cleanup

.cfignore

@@ -1,5 +1,20 @@
 # This file is a copy of .gitignore except for file/folders created by the build
 
+# from deploy-exclude.lst
+*__pycache__*
+.git/*
+app/assets/*
+bower_components/*
+cache/*
+.cache/*
+node_modules/*
+target/*
+venv/*
+.envrc
+.cf/*
+.pytest_cache/*
+
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

deploy-exclude.lst

@@ -1,12 +0,0 @@
-*__pycache__*
-.git/*
-app/assets/*
-bower_components/*
-cache/*
-.cache/*
-node_modules/*
-target/*
-venv/*
-.envrc
-.cf/*
-.pytest_cache/*

manifest.yml.j2

@@ -1,65 +0,0 @@
-{%- set apps = {
-  'notify-admin': {
-    'routes': {
-      'preview': ['www.notify.works', 'notify-admin-preview.apps.internal'],
-      'staging': ['www.staging-notify.works', 'notify-admin-staging.apps.internal'],
-      'production': ['www.notifications.service.gov.uk', 'notify-admin-production.apps.internal'],
-    }
-  },
-  'notify-admin-prototype': {},
-  'notify-admin-prototype-2': {}
-} -%}
-
-{%- set app = apps[CF_APP] -%}
-
----
-applications:
-  - name: {{ CF_APP }}
-    buildpack: python_buildpack
-
-    memory: 1G
-
-    routes:
-      - route: {{ CF_APP }}-{{ environment }}.cloudapps.digital
-      {%- for route in app.get('routes', {}).get(environment, []) %}
-      - route: {{ route }}
-      {%- endfor %}
-
-    health-check-type: http
-    health-check-http-endpoint: '/_status?simple=true'
-    health-check-invocation-timeout: 10
-
-    services:
-      - logit-ssl-syslog-drain
-      - notify-prometheus
-      - notify-splunk
-      - notify-redis
-
-    env:
-      NOTIFY_APP_NAME: admin
-      NOTIFY_LOG_PATH: /home/vcap/logs/app.log
-      FLASK_APP: application.py
-      NOTIFY_ENVIRONMENT: {{ environment }}
-
-      # Credentials variables
-      ADMIN_CLIENT_SECRET: '{{ ADMIN_CLIENT_SECRET }}'
-      ADMIN_BASE_URL: '{{ ADMIN_BASE_URL }}'
-      API_HOST_NAME: '{{ API_HOST_NAME }}'
-      DANGEROUS_SALT: '{{ DANGEROUS_SALT }}'
-      SECRET_KEY: '{{ SECRET_KEY }}'
-      ROUTE_SECRET_KEY_1: '{{ ROUTE_SECRET_KEY_1 }}'
-      ROUTE_SECRET_KEY_2: '{{ ROUTE_SECRET_KEY_2 }}'
-      METRICS_BASIC_AUTH_TOKEN: {{ METRICS_BASIC_AUTH_TOKEN }}
-
-      AWS_ACCESS_KEY_ID: '{{ AWS_ACCESS_KEY_ID }}'
-      AWS_SECRET_ACCESS_KEY: '{{ AWS_SECRET_ACCESS_KEY }}'
-
-      ANTIVIRUS_API_HOST: '{{ ANTIVIRUS_API_HOST }}'
-      ANTIVIRUS_API_KEY: '{{ ANTIVIRUS_API_KEY }}'
-
-      ZENDESK_API_KEY: '{{ ZENDESK_API_KEY }}'
-
-      TEMPLATE_PREVIEW_API_HOST: '{{ TEMPLATE_PREVIEW_API_HOST }}'
-      TEMPLATE_PREVIEW_API_KEY: '{{ TEMPLATE_PREVIEW_API_KEY }}'
-
-      NOTIFY_BILLING_DETAILS: '{{ NOTIFY_BILLING_DETAILS | tojson }}'

sample.env

@@ -1,5 +1,24 @@
+# STEPS TO SET UP
+#
+# 1. Pull down AWS creds from cloud.gov using `cf env`, then update AWS section
+#
+# 2. Uncomment either the Docker setup or the direct setup
+#
+# 3. Comment out the other setup
+#
+
 # ## REBUILD THE DEVCONTAINER WHEN YOU MODIFY .ENV ###
 
+#############################################################
+
+# AWS
+AWS_REGION=us-west-2
+AWS_ACCESS_KEY_ID="don't write secrets to the sample file"
+AWS_SECRET_ACCESS_KEY="don't write secrets to the sample file"
+
+#############################################################
+
+# Application
 NOTIFY_ENVIRONMENT=development
 FLASK_APP=application.py
 FLASK_ENV=development
@@ -8,11 +27,12 @@ WERKZEUG_DEBUG_PIN=off
 ANTIVIRUS_ENABLED=0
 NODE_VERSION=16.15.1
 
-# URL of api app (on AWS this is the internal api endpoint)
-API_HOST_NAME=http://dev:6011
-REDIS_URL=redis://adminredis:6379/0
+#############################################################
 
-# AWS
-AWS_REGION=us-west-2
-AWS_ACCESS_KEY_ID="don't write secrets to the sample file"
-AWS_SECRET_ACCESS_KEY="don't write secrets to the sample file"
+# Local Docker setup
+# API_HOST_NAME=http://dev:6011
+# REDIS_URL=redis://adminredis:6379/0
+
+# Local direct setup
+API_HOST_NAME=http://localhost:6011
+REDIS_URL=redis://localhost:6379/0

varsfile.sample

@@ -1,9 +0,0 @@
-ADMIN_CLIENT_SECRET: asdf
-DANGEROUS_SALT: asdf
-SECRET_KEY: asdf
-ROUTE_SECRET_KEY_1: asdf
-ROUTE_SECRET_KEY_2: asdf
-AWS_ACCESS_KEY_ID: asdf
-AWS_SECRET_ACCESS_KEY: asdf
-BASIC_AUTH_USERNAME: asdf
-BASIC_AUTH_PASSWORD: asdf