From 1fca473257bad61c3e6a6dc7ef8652f1a7fe8a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 23 Mar 2018 12:12:39 +0100
Subject: [PATCH] Moved Apache files into separate subdir

---
 docker/4_run/{ => apache}/000-default.conf                | 0
 docker/4_run/{ => apache}/apache2.conf                    | 0
 .../{apache-logrotate.conf => apache/logrotate.conf}      | 0
 docker/4_run/{ => apache}/wsgi-py36.conf                  | 0
 docker/4_run/{ => apache}/wsgi-py36.load                  | 0
 docker/4_run/run.docker                                   | 8 ++++----
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename docker/4_run/{ => apache}/000-default.conf (100%)
 rename docker/4_run/{ => apache}/apache2.conf (100%)
 rename docker/4_run/{apache-logrotate.conf => apache/logrotate.conf} (100%)
 rename docker/4_run/{ => apache}/wsgi-py36.conf (100%)
 rename docker/4_run/{ => apache}/wsgi-py36.load (100%)

diff --git a/docker/4_run/000-default.conf b/docker/4_run/apache/000-default.conf
similarity index 100%
rename from docker/4_run/000-default.conf
rename to docker/4_run/apache/000-default.conf
diff --git a/docker/4_run/apache2.conf b/docker/4_run/apache/apache2.conf
similarity index 100%
rename from docker/4_run/apache2.conf
rename to docker/4_run/apache/apache2.conf
diff --git a/docker/4_run/apache-logrotate.conf b/docker/4_run/apache/logrotate.conf
similarity index 100%
rename from docker/4_run/apache-logrotate.conf
rename to docker/4_run/apache/logrotate.conf
diff --git a/docker/4_run/wsgi-py36.conf b/docker/4_run/apache/wsgi-py36.conf
similarity index 100%
rename from docker/4_run/wsgi-py36.conf
rename to docker/4_run/apache/wsgi-py36.conf
diff --git a/docker/4_run/wsgi-py36.load b/docker/4_run/apache/wsgi-py36.load
similarity index 100%
rename from docker/4_run/wsgi-py36.load
rename to docker/4_run/apache/wsgi-py36.load
diff --git a/docker/4_run/run.docker b/docker/4_run/run.docker
index 121b449..eee2634 100755
--- a/docker/4_run/run.docker
+++ b/docker/4_run/run.docker
@@ -36,12 +36,12 @@ ENV USE_X_SENDFILE True
 EXPOSE 80
 EXPOSE 5000
 
-ADD wsgi-py36.* /etc/apache2/mods-available/
+ADD apache/wsgi-py36.* /etc/apache2/mods-available/
 RUN a2enmod rewrite && a2enmod wsgi-py36
 
-ADD apache2.conf /etc/apache2/apache2.conf
-ADD 000-default.conf /etc/apache2/sites-available/000-default.conf
-ADD apache-logrotate.conf /etc/logrotate.d/apache2
+ADD apache/apache2.conf /etc/apache2/apache2.conf
+ADD apache/000-default.conf /etc/apache2/sites-available/000-default.conf
+ADD apache/logrotate.conf /etc/logrotate.d/apache2
 ADD *.sh /
 
 # Remove some empty top-level directories we won't use anyway.