Merge branch 'master' into pr-dokku-events

2015-07-01 17:50:09 +01:00
parent 1d4b9a19a8 c4540701fd
commit 172e71cac6
3 changed files with 6 additions and 2 deletions
--- a/plugins/nginx-vhosts/templates/nginx.ssl.conf.template
+++ b/plugins/nginx-vhosts/templates/nginx.ssl.conf.template
@@ -2,6 +2,8 @@ server {
  listen      [::]:80;
  listen      80;
  server_name $NOSSL_SERVER_NAME;
+  access_log  /var/log/nginx/${APP}-access.log;
+  error_log   /var/log/nginx/${APP}-error.log;
  return 301 https://\$host\$request_uri;
 }

@@ -9,6 +11,8 @@ server {
  listen      [::]:443 ssl spdy;
  listen      443 ssl spdy;
  server_name $SSL_SERVER_NAME;
+  access_log  /var/log/nginx/${APP}-access.log;
+  error_log   /var/log/nginx/${APP}-error.log;
 $SSL_DIRECTIVES

  keepalive_timeout   70;