From b8f165ab1cb4d4345d8a25f95a5bc0fece2d49c7 Mon Sep 17 00:00:00 2001
From: Bhasker Hariharan <bhaskerh@google.com>
Date: Wed, 1 Jul 2020 06:57:38 -0700
Subject: Fix HTTPD benchmarks to correctly serve files from /tmp.

Fixes #3113

PiperOrigin-RevId: 319216671
---
 benchmarks/workloads/httpd/BUILD               |  1 +
 benchmarks/workloads/httpd/Dockerfile          | 10 +++++-----
 benchmarks/workloads/httpd/apache2-tmpdir.conf |  5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 benchmarks/workloads/httpd/apache2-tmpdir.conf

diff --git a/benchmarks/workloads/httpd/BUILD b/benchmarks/workloads/httpd/BUILD
index a70873065..83450d190 100644
--- a/benchmarks/workloads/httpd/BUILD
+++ b/benchmarks/workloads/httpd/BUILD
@@ -9,5 +9,6 @@ pkg_tar(
     name = "tar",
     srcs = [
         "Dockerfile",
+        "apache2-tmpdir.conf",
     ],
 )
diff --git a/benchmarks/workloads/httpd/Dockerfile b/benchmarks/workloads/httpd/Dockerfile
index 5259c8f4f..52a550678 100644
--- a/benchmarks/workloads/httpd/Dockerfile
+++ b/benchmarks/workloads/httpd/Dockerfile
@@ -6,16 +6,16 @@ RUN set -x \
             apache2 \
         && rm -rf /var/lib/apt/lists/*
 
-# Link the htdoc directory to tmp.
-RUN mkdir -p /usr/local/apache2/htdocs && \
-        cd /usr/local/apache2 && ln -s /tmp htdocs
-
 # Generate a bunch of relevant files.
 RUN mkdir -p /local && \
         for size in 1 10 100 1000 1024 10240; do \
                 dd if=/dev/zero of=/local/latin${size}k.txt count=${size} bs=1024; \
         done
 
+# Rewrite DocumentRoot to point to /tmp/html instead of the default path.
+RUN sed -i 's/DocumentRoot.*\/var\/www\/html$/DocumentRoot   \/tmp\/html/' /etc/apache2/sites-enabled/000-default.conf
+COPY ./apache2-tmpdir.conf /etc/apache2/sites-enabled/apache2-tmpdir.conf
+
 # Standard settings.
 ENV APACHE_RUN_DIR /tmp
 ENV APACHE_RUN_USER nobody
@@ -24,4 +24,4 @@ ENV APACHE_LOG_DIR /tmp
 ENV APACHE_PID_FILE /tmp/apache.pid
 
 # Copy on start-up; serve everything from /tmp (including the configuration).
-CMD ["sh", "-c", "cp -a /local/* /tmp && apache2 -c \"ServerName localhost\" -c \"DocumentRoot /tmp\" -X"]
+CMD ["sh", "-c", "mkdir -p /tmp/html && cp -a /local/* /tmp/html && apache2 -X"]
diff --git a/benchmarks/workloads/httpd/apache2-tmpdir.conf b/benchmarks/workloads/httpd/apache2-tmpdir.conf
new file mode 100644
index 000000000..e33f8d9bb
--- /dev/null
+++ b/benchmarks/workloads/httpd/apache2-tmpdir.conf
@@ -0,0 +1,5 @@
+<Directory /tmp/html/>
+        Options Indexes FollowSymLinks
+        AllowOverride None
+        Require all granted
+</Directory>
\ No newline at end of file
-- 
cgit v1.2.3