From daae31c044b1e81c5b30cdb3e0dcf31b55039144 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Fri, 14 Sep 2018 07:40:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20404=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=BE=D0=BC=D0=B0=D1=88?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B9=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                          | 9 +++++++++
 ansible/roles/homepage/meta/main.yml              | 2 +-
 ansible/roles/homepage/templates/homepage.conf.j2 | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c922566..8fbcb1f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,15 @@ configure:
 		--ask-become-pass \
 		ansible/configuration.yml
 
+configure-web-server:
+	ansible-playbook \
+		--inventory "ansible/hosts_prod" \
+		--extra-vars='ansible_python_interpreter=/usr/bin/python3' \
+		--user=av \
+		--ask-become-pass \
+		--tags webserver \
+		ansible/configuration.yml
+
 dry-run:
 	ansible-playbook \
 		--inventory "ansible/hosts_prod" \
diff --git a/ansible/roles/homepage/meta/main.yml b/ansible/roles/homepage/meta/main.yml
index 358afb4..47d0af9 100644
--- a/ansible/roles/homepage/meta/main.yml
+++ b/ansible/roles/homepage/meta/main.yml
@@ -8,7 +8,7 @@ dependencies:
       - '{{ homepage_domain }}'
       - 'www.{{ homepage_domain }}'
     tags:
-      - ssl
+      - webserver
 
   - role: blocks/static-site
     static_site_name: '{{ homepage_name }}'
diff --git a/ansible/roles/homepage/templates/homepage.conf.j2 b/ansible/roles/homepage/templates/homepage.conf.j2
index a79d96c..b2908b0 100755
--- a/ansible/roles/homepage/templates/homepage.conf.j2
+++ b/ansible/roles/homepage/templates/homepage.conf.j2
@@ -28,4 +28,13 @@ server {
         index index.html;
         try_files $uri $uri/ =404;
     }
+
+    error_page 404 /404/;
+
+    location = /404/ {
+        root {{ homepage_dir }}/current;
+        index index.html;
+        try_files $uri $uri/ =409;
+        internal;
+    }
 }