Skip to content

Commit

Permalink
Send apache errors to Docker log
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelmcandrew committed Mar 2, 2018
1 parent 8bfaf6a commit 65a0971
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 5 deletions.
2 changes: 2 additions & 0 deletions civicrm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
40 changes: 40 additions & 0 deletions civicrm/apache24-vhost.php
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 4 additions & 5 deletions civicrm/buildkit.ini
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 65a0971

Please sign in to comment.