diff --git a/nginx/files/_log.conf b/nginx/files/_log.conf
index dd9a4b8..b1c1a42 100644
--- a/nginx/files/_log.conf
+++ b/nginx/files/_log.conf
@@ -1,3 +1,5 @@
+{%- from "nginx/map.jinja" import server with context -%}
+{%- set site = salt['pillar.get']('nginx:server:site:'+site_name) %}
 
-  access_log /var/log/nginx/{{ site_name }}-access.log;
-  error_log /var/log/nginx/{{ site_name }}-error.log;
+  access_log {{ site.get('log', {}).get('access', server.log_dir + '/' + site_name + '-access.log') }};
+  error_log {{ site.get('log', {}).get('error', server.log_dir + '/' + site_name + '-error.log') }};
diff --git a/nginx/files/nginx.conf b/nginx/files/nginx.conf
index 9f19e7d..c70f7a0 100644
--- a/nginx/files/nginx.conf
+++ b/nginx/files/nginx.conf
@@ -35,8 +35,8 @@
         # Logging Settings
         ##
 
-        access_log /var/log/nginx/access.log;
-        error_log /var/log/nginx/error.log;
+        access_log {{ server.get('log', {}).get('access', server.log_dir + '/access.log') }};
+        error_log {{ server.get('log', {}).get('error', server.log_dir + '/error.log') }};
 
         ##
         # Gzip Settings
@@ -70,8 +70,8 @@
         #passenger_ruby /usr/bin/ruby;
 
 {% if server.upstream is defined %}
-	## Upstreams
-	include /etc/nginx/upstream.conf;
+        ## Upstreams
+        include /etc/nginx/upstream.conf;
 {% endif %}
 
         ##