Skip to content

Commit

Permalink
fix(apache): configure apache to log to stdout/stderr (#7375)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
paulczar authored and Jammy Louie committed Sep 6, 2019
1 parent 3e76186 commit 7e7c2cc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 0 deletions.
4 changes: 4 additions & 0 deletions docker/run-apache2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions docker/setup-apache2.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions docker/spinnaker.conf.gen
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions docker/spinnaker.conf.ssl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 7e7c2cc

Please sign in to comment.