Merge pull request #77 from bersace/log_format

Parametrize log_format
7 years ago · 769a84ece8
parent 490b4ad21f c4605ded8f
commit 769a84ece8
2 changed files with 5 additions and 3 deletions
--- a/defaults/main.yml
+++ b/defaults/main.yml
@ -73,3 +73,7 @@ nginx_upstreams: []
 #     "srv2.example.com weight=3",
 #     "srv3.example.com"
 #   }
+nginx_log_format: |
+  '$remote_addr - $remote_user [$time_local] "$request" '
+  '$status $body_bytes_sent "$http_referer" '
+  '"$http_user_agent" "$http_x_forwarded_for"'
--- a/templates/nginx.conf.j2
+++ b/templates/nginx.conf.j2
@ -22,9 +22,7 @@ http {

    client_max_body_size {{ nginx_client_max_body_size }};

-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
+    log_format  main  {{ nginx_log_format|indent(23) }};

    access_log  {{ nginx_access_log }};