alphagov · 36degrees · Jul 4, 2017 · Jul 3, 2017
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-build/
+deploy/public
diff --git a/config.rb b/config.rb
@@ -1,3 +1,5 @@
+set :build_dir, 'deploy/public'
+
 # Activate and configure extensions
 # https://middlemanapp.com/advanced/configuration/#configuring-extensions
 

diff --git a/deploy/Staticfile b/deploy/Staticfile
@@ -0,0 +1,6 @@
+# We upload the entire deploy directory which includes the build directory and
+# config, but only want to serve the build directory (deploy/public)
+root: public
+
+# Include e.g. custom error page config within the nginx location block
+location_include: includes/*.conf
diff --git a/deploy/nginx/conf/includes/error_pages.conf b/deploy/nginx/conf/includes/error_pages.conf
@@ -0,0 +1,3 @@
+error_page 404 /errors/404.html;
+error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 500 501 502 503 504 505 506 507 508 509 510 511 /errors/generic.html;
+
diff --git a/manifest.yml b/manifest.yml
@@ -2,5 +2,5 @@
 applications:
 - name: govuk-design-system-production
   memory: 64M
-  path: ./build
+  path: ./deploy
   buildpack: staticfile_buildpack
diff --git a/source/errors/404.html.erb b/source/errors/404.html.erb
@@ -0,0 +1 @@
+<h1>404 Not Found</h1>
diff --git a/source/errors/generic.html.erb b/source/errors/generic.html.erb
@@ -0,0 +1 @@
+<h1>Something went wrong</h1>