Merge remote-tracking branch 'origin' into rc/empanada

4b80d36d · John Jarvis · e5944656 · bf9857d9 · 4b80d36d · 4b80d36d
Commit 4b80d36d authored Dec 27, 2013 by John Jarvis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

playbooks/roles/nginx/templates/edx_logrotate_nginx_access.j2
+1 -1

playbooks/roles/nginx/templates/edx_logrotate_nginx_error.j2
+1 -1

No files found.
--- a/playbooks/roles/nginx/templates/edx_logrotate_nginx_access.j2
+++ b/playbooks/roles/nginx/templates/edx_logrotate_nginx_access.j2
 # Put in place by ansible
-{{ nginx_log_dir }}/access.log {
+{{ nginx_log_dir }}/*access.log {
  create 0640 www-data adm
  compress
  delaycompress

--- a/playbooks/roles/nginx/templates/edx_logrotate_nginx_error.j2
+++ b/playbooks/roles/nginx/templates/edx_logrotate_nginx_error.j2
 # Put in place by ansible
-{{ nginx_log_dir }}/error.log {
+{{ nginx_log_dir }}/*error.log {
  create 0640 www-data adm
  compress
  delaycompress