Merge pull request #244 from abellotti/httpd_stdout_stderr

Ensures httpd error_log and access_log are seen by docker or oc logs commands (cherry picked from commit b80cb34)
ManageIQ · Jan 15, 2018 · 363ff05 · 363ff05
1 parent 92f7d48
commit 363ff05
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/templates/miq-template-ext-db.yaml b/templates/miq-template-ext-db.yaml
@@ -456,6 +456,10 @@ objects:
         RewriteCond %{REQUEST_URI} !^/saml2
         RewriteRule ^/ http://${NAME}%{REQUEST_URI} [P,QSA,L]
         ProxyPassReverse / http://${NAME}/
+
+        # Ensures httpd stdout/stderr are seen by docker logs.
+        ErrorLog  "| /usr/bin/tee /proc/1/fd/2 /var/log/httpd/error_log"
+        CustomLog "| /usr/bin/tee /proc/1/fd/1 /var/log/httpd/access_log" common
       </VirtualHost>
     authentication.conf: |
       # Load appropriate authentication configuration files

diff --git a/templates/miq-template.yaml b/templates/miq-template.yaml
@@ -146,6 +146,10 @@ objects:
         RewriteCond %{REQUEST_URI} !^/saml2
         RewriteRule ^/ http://${NAME}%{REQUEST_URI} [P,QSA,L]
         ProxyPassReverse / http://${NAME}/
+
+        # Ensures httpd stdout/stderr are seen by docker logs.
+        ErrorLog  "| /usr/bin/tee /proc/1/fd/2 /var/log/httpd/error_log"
+        CustomLog "| /usr/bin/tee /proc/1/fd/1 /var/log/httpd/access_log" common
       </VirtualHost>
     authentication.conf: |
       # Load appropriate authentication configuration files