From 7e7c2cc0d2cc0b20f99446e1f0c8a32e544cbab5 Mon Sep 17 00:00:00 2001
From: Paul Czarkowski <username.taken@gmail.com>
Date: Fri, 6 Sep 2019 14:03:17 -0500
Subject: [PATCH] fix(apache): configure apache to log to stdout/stderr (#7375)

Reports of deck failing with a full /var led me to finding
that apache is not configured as per docker best practices
to log to stdout/stderr.  This addresses that.

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
---
 docker/run-apache2.sh     | 4 ++++
 docker/setup-apache2.sh   | 2 ++
 docker/spinnaker.conf.gen | 2 ++
 docker/spinnaker.conf.ssl | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/docker/run-apache2.sh b/docker/run-apache2.sh
index 8740ce7ab1e..1fa2c9e7359 100755
--- a/docker/run-apache2.sh
+++ b/docker/run-apache2.sh
@@ -44,6 +44,10 @@ mv spinnaker.conf  /etc/apache2/sites-available
 
 a2ensite spinnaker
 
+# Disable default site
+
+a2dissite 000-default
+
 # Update ports.conf to reflect desired deck host
 
 cp docker/ports.conf.gen ports.conf
diff --git a/docker/setup-apache2.sh b/docker/setup-apache2.sh
index 9c436131627..275d3097b3a 100755
--- a/docker/setup-apache2.sh
+++ b/docker/setup-apache2.sh
@@ -1,5 +1,7 @@
 apt-get update
 apt-get install apache2 -y
+rm -rf /var/lib/apt/lists/* 
+
 service apache2 stop
 a2enmod proxy proxy_ajp proxy_http rewrite deflate headers proxy_balancer proxy_connect proxy_html xml2enc
 chown -R www-data:www-data /etc/apache2
diff --git a/docker/spinnaker.conf.gen b/docker/spinnaker.conf.gen
index 8fb21134437..df660501801 100644
--- a/docker/spinnaker.conf.gen
+++ b/docker/spinnaker.conf.gen
@@ -4,6 +4,8 @@
   ProxyPass "/gate" "{%API_HOST%}" retry=0
   ProxyPassReverse "/gate" "{%API_HOST%}"
   ProxyPreserveHost On
+  ErrorLog /dev/stderr
+  TransferLog /dev/stdout
 
   <Directory "/opt/deck/html/">
     Require all granted
diff --git a/docker/spinnaker.conf.ssl b/docker/spinnaker.conf.ssl
index 320959cd78a..4475274bea8 100644
--- a/docker/spinnaker.conf.ssl
+++ b/docker/spinnaker.conf.ssl
@@ -8,6 +8,9 @@
   ProxyPass "/gate" "{%API_HOST%}" retry=0
   ProxyPassReverse "/gate" "{%API_HOST%}"
 
+  ErrorLog /dev/stderr
+  TransferLog /dev/stdout
+
   <Directory "/opt/deck/html/">
     Require all granted
   </Directory>