diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 35ee81fd4..1198be6d0 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -36,3 +36,15 @@ src: "{{ doc_root }}/common/fonts" path: "{{ doc_root }}/common/webfonts" state: link + +- name: Create log files which apache and nginx can write + file: + path: "{{ item }}" + owner: www-data + group: www-data + mode: 0660 + state: directory + with_items: + - /var/log/apache2 + - "{{ nginx_log_dir }}" + diff --git a/roles/nginx/templates/nginx.conf b/roles/nginx/templates/nginx.conf index 26937a067..f77fea38f 100644 --- a/roles/nginx/templates/nginx.conf +++ b/roles/nginx/templates/nginx.conf @@ -42,8 +42,13 @@ http { # Logging Settings ## - access_log {{ apache_log_dir }}/access.log; - error_log {{ apache_log_dir }}/error.log; + log_format awstats + '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "http_x_forwarded_for"'; + + access_log {{ nginx_log_dir }}/access.log awstats; + error_log {{ nginx_log_dir }}/error.log; log_format scripts '$request > $document_root$fastcgi_script_name $fastcgi_path_info'; diff --git a/vars/default_vars.yml b/vars/default_vars.yml index d4c4d04bb..4619ad3e2 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -244,6 +244,7 @@ nginx_interface: "0.0.0.0" nginx_install: True nginx_enabled: True nginx_config_dir: /etc/nginx/conf.d +nginx_log_dir: /var/log/nginx # See also Apache vars {default_language, language_priority} @ top of this file #