From 65a0971e4cdb2beb0a5f88880540fe2879c896f0 Mon Sep 17 00:00:00 2001
From: Michael McAndrew <michaelmcandrew@thirdsectordesign.org>
Date: Fri, 2 Mar 2018 13:26:28 +0000
Subject: [PATCH] Send apache errors to Docker log

---
 civicrm/Dockerfile         |  2 ++
 civicrm/apache24-vhost.php | 40 ++++++++++++++++++++++++++++++++++++++
 civicrm/buildkit.ini       |  9 ++++-----
 3 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 civicrm/apache24-vhost.php

diff --git a/civicrm/Dockerfile b/civicrm/Dockerfile
index 672330b..2d03aa4 100644
--- a/civicrm/Dockerfile
+++ b/civicrm/Dockerfile
@@ -99,4 +99,6 @@ RUN rm /buildkit/app/civicrm.settings.d/100-mail.php
 
 COPY civibuild.conf /buildkit/app/civibuild.conf
 
+COPY apache24-vhost.php /buildkit/build/.amp/apache24-vhost.php
+
 USER root
diff --git a/civicrm/apache24-vhost.php b/civicrm/apache24-vhost.php
new file mode 100644
index 0000000..6630cc1
--- /dev/null
+++ b/civicrm/apache24-vhost.php
@@ -0,0 +1,40 @@
+<?php
+/* Apache Virtual Host Template
+ *
+ * @var string $root - the local path to the web root
+ * @var string $host - the hostname to listen for
+ * @var int $port - the port to listen for
+ * @var string $include_vhost_file - the local path to a related config file
+ * @var string $visibility - which interfaces the vhost is available on
+ */
+
+?>
+
+<?php if ($use_listen) { ?>
+<?php if ($visibility === 'all'): ?>
+Listen <?php echo $port ?>
+<?php else: ?>
+Listen 127.0.0.1:<?php echo $port ?>
+<?php endif; ?>
+<?php } ?>
+
+<VirtualHost *:<?php echo $port ?>>
+    ServerAdmin webmaster@<?php echo $host ?>
+
+    DocumentRoot "<?php echo $root ?>"
+
+    ServerName <?php echo $host ?>
+
+    <Directory "<?php echo $root ?>">
+        Options All
+        AllowOverride All
+        <IfModule mod_authz_host.c>
+            Require <?php echo $visibility ?> granted
+        </IfModule>
+    </Directory>
+
+    <?php if (!empty($include_vhost_file)) { ?>
+    Include <?php echo $include_vhost_file ?>
+    <?php } ?>
+
+</VirtualHost>
diff --git a/civicrm/buildkit.ini b/civicrm/buildkit.ini
index 5c35a75..8d54500 100644
--- a/civicrm/buildkit.ini
+++ b/civicrm/buildkit.ini
@@ -1,7 +1,6 @@
 memory_limit = 1024M
+cgi.fix_pathinfo = Off
 sendmail_path=/usr/sbin/sendmail -t -i
-cgi.fix_pathinfo = 0
-log_errors = On
-error_log = syslog
-; do not enable xdebug for now
-;zend_extension=xdebug.so
+
+zend_extension=xdebug.so
+xdebug.show_error_trace = On