Merge branch 'master' into form_views_refactor

.travis.yml

@@ -22,11 +22,27 @@ notifications:
     rooms:
       secure: A6n6Gdz3dsE+KQcOd1nWTvdjOF2YbgItT1E40r25poG6p04WHd8qWtC4T2FuZaxPN/TQdKr/dKa/WCkmiEdxT5O0SOwAnAD3u6Fn2nthoI4M5916UrK1ZrqupvnFPSQc8Ivh51PGkcmB4wrb0ylRhMB94RmLcUZcVuXLDx57GO8bPFyLC3E9bgcVVFWaX45sKs74sBSQWi9EBbzHIuduLdjIpW7wX07dA++HlY14W5WgiurmiYohfP11VdAMmMxJs2WdWk16O/qy0HZXaldNIsSnuDBkhAZOMeSrcvp+62yOiN8jK0nSa1IRr3IoUkITdC9YGys3xFJb8gyIQE9T3hUnTYAKCcgsgpVFS6UzsRN42JUAJ8rFTgK9/J299yTk4lqL8uWzcV1QcKXIPNoG0QfqkmlB9B1fKbXuE/KkPEXPCKAcVQpCzEon09FgTCrlVZqJ6HxQonnLcPlIpVzWHAFokLZVHLAFMKYJnGBcZ6zaRK5pdc1babcOXMIPBC8j028G5bhBaCviDvZlimxOsUK1sJTpjzMU0tBQZa8lI+0O5otvMKiX8jPyaedjVvUmsftF2O5FH5nz2ofJC7BThb76/Tac2pNTCn0pWiVz9wi/YXALOMdIzkYgHnyZdEqAjRlpFwZuOrzR6MuvivBebPxjYaRWzCjOeC1uIwz+48E=
 deploy:
-- provider: heroku
-  api_key:
-    secure: Er2XHDpbwKvc0empImhEQCvSZ5o2meC3o6nGNAy3WoD3Vc2UiPxn7+OkQKYN0Bt/5BTQcYeGrsM1vDSt/pYsODCuzujkewB94NEJ/zN9hArCuYAEte/r9tAm4faaMIYBU54HAUqFOz/jYo/zzpFiznnVzGlcJXTbmgjXWBLtx5UBeb/cRyP0ErwbjIclv9rBScXiinflo4aSAhJn1sMwbh4646HCjmGm7NVLIM7sooReBHqpuH7qD1bcmssTIea2RDBhy2Qfi6jMbvlRUqPbhNMtQaZrPg6u4/3riYt61ZvrGFtHVcbprpX+IVIdYqEoDq4N0qAKkEVXu+mjfPQjk5+xFguqJ94j6mPrcW4p95SbwRMk/qXZhjOiV3N4mucghbF8dYjsFDSXf9fe7gc4NFAlQK70kS4OBGFQ3nkaHXCkLT4yvKK4vsAHMeNQrVnECHdRRPPP4y7srbQCTdfdJMnJ+tuUpkpNbj9U2DzTTGwEuGiWGwWsNU9tQ7pAftbzsD3gRy7b9iYXnriz8l7yMxN6aoIL4lV3PWi3drHuLHxPHeVnetfK/gDx55Lb5WXNeX2VZmLp9kSJx32OdKF2yhvI6uOYJKR6weTJkIYEBK9+kB5+0aOpG83Dvn8Co6I9nkdMt8CGK2UOX1X1IrgXrtIMSOkVVLPPPWqTaUiJXHg=
-  app: notifications-admin
-  on:
+- provider: s3
+  access_key_id: AKIAI37IS2VAC5PJHHDA
+  secret_access_key: &1
+    secure: FZ0OcAyYPY8kyMB+JwdV1XBz9gT0uThGmdti4oR72cdnpoIMbPfwTmkIiRu2tlW8OplS+RnuivFDxBXOdaQUkcOSTZZAywdROVdNSf98XfiWmWopH+FZtp3cCu+tWgePseVUBBEIfQ0gPdZaflh/c4Yw2888MaUKOOMuqYb9CuEvDtzbFJ3fs6lstK2dveE9pHgVFkQgppLohDGaWFEEXG+fngYqPukK4pvoA8LD7TWW9kTbK8HEG56kvVLxrU7HWisCxHjwB761Zenbq3AiWcVtNaD8DfMzEM/1jKliWjjyAdyAH3EkSti0HJnM4b5L9ewIukt/yr3xtH4Hz0xHgQ+nzk0g81+OB1lQSRl63aNk6sExknsUbKPDCoUOYbmp6FXEohN42EJTywMUfsaDgvdcH71MCcIV+z/YIUoI1RfMEGK4jYDYH6j1477BvhxuywD7CSvHRsjLyT4xmFGxlbg7E02TrMUe7Fon2uPa3Olf/vmbkyhur4tTYEwYwQhIk/txVXazh3QFQx3jrtPaisvuf6cjyCCH92LoKYj/JQ9EZaBZjjbfNF4N8b+WNDPGkLPWWtFTkkDkXgFs72pX8NSJiCbq2kdLo0zV0J8cQlgiRuMGHQQE6t5MnoT/UaUPhSMajcIgh6RZDT9wcU4svs8wfVdOnMeN2ClnARa26Kw=
+  local_dir: dpl_cd_upload
+  skip_cleanup: true
+  on: &2
     repo: alphagov/notifications-admin
-  run:
-    - python app.py db upgrade
+  bucket: notifications-admin-codedeploy
+  region: eu-west-1
+- provider: codedeploy
+  access_key_id: AKIAI37IS2VAC5PJHHDA
+  secret_access_key: *1
+  bucket: notifications-admin-codedeploy
+  key: notifications-admin.zip
+  bundle_type: zip
+  application: notifications-admin
+  deployment_group: notifications_admin_deployment_group
+  region: eu-west-1
+  on: *2
+before_deploy:
+- zip -r notifications-admin *
+- mkdir -p dpl_cd_upload
+- mv notifications-admin.zip dpl_cd_upload/notifications-admin.zip

README.md

@@ -27,10 +27,17 @@ Node's package management tool.
     brew install node
 ```
 
+n is a tool for managing different versions of node. The following installs n and uses the latest version of node.
+
+    npm install -g n
+    n latest
+    npm rebuild node-sass
+ 
 Most of the frontend dependencies are managed using Git Submodules. Some are
 managed with NPM and Bower. To install or update *all the things*, run
 ```shell
-    git submodule init --update
+    git submodule init 
+    git submodule update
     npm install
 ```
 

app/main/views/jobs.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import time
 from flask import render_template
 from app.main import main

scripts/aws_change_ownership.sh

@@ -2,4 +2,4 @@
 
 echo "Chown application to be owned by ubuntu"
 cd /home/ubuntu/;
-chown ubuntu:ubuntu notifications-admin
+chown -R ubuntu:ubuntu notifications-admin