From d231d6177edd174a44efe622b0b90d3138ebe252 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 16 Apr 2020 12:16:19 -0500
Subject: [PATCH] Grant access to robots.txt

Apache doesn't like serving files it hasn't been allowed to.

Change-Id: I1113c44f9621229074804d60eba7549ae1236583
---
 playbooks/roles/etherpad/tasks/main.yaml             | 7 ++++++-
 playbooks/roles/etherpad/templates/etherpad.vhost.j2 | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/playbooks/roles/etherpad/tasks/main.yaml b/playbooks/roles/etherpad/tasks/main.yaml
index 42d004c051..8b32a95612 100644
--- a/playbooks/roles/etherpad/tasks/main.yaml
+++ b/playbooks/roles/etherpad/tasks/main.yaml
@@ -28,10 +28,15 @@
     src: my.cnf
     dest: /etc/etherpad/mysql/my.cnf
 
+- name: Make directory for robots.txt
+  file:
+    path: /var/etherpad/www
+    state: directory
+
 - name: Install robots.txt
   copy:
     src: robots.txt
-    dest: /var/etherpad/robots.txt
+    dest: /var/etherpad/www/robots.txt
 
 - name: Install apache2
   apt:
diff --git a/playbooks/roles/etherpad/templates/etherpad.vhost.j2 b/playbooks/roles/etherpad/templates/etherpad.vhost.j2
index a4650be345..55eb1ecf37 100644
--- a/playbooks/roles/etherpad/templates/etherpad.vhost.j2
+++ b/playbooks/roles/etherpad/templates/etherpad.vhost.j2
@@ -95,5 +95,9 @@
       ProxyPassReverse / http://localhost:9001/
   </IfModule>
 
+  <Directory /var/etherpad/www/>
+    Require all granted
+  </Directory>
+
 </VirtualHost>
 </IfModule>