diff --git a/geoserver/geoserver/defaults/main.yml b/geoserver/geoserver/defaults/main.yml
index 762a74a..101f332 100644
--- a/geoserver/geoserver/defaults/main.yml
+++ b/geoserver/geoserver/defaults/main.yml
@@ -9,5 +9,7 @@ geoserver_download_url: 'http://sourceforge.net/projects/geoserver/files/GeoServ
 geoserver_additional_jars: False
 
 geoserver_download_directory: /srv/geoserver
+geoserver_create_data_dir: True
 geoserver_data_directory: /srv/geoserver_data
+geoserver_log_directory: /var/log/geoserver
 
diff --git a/geoserver/geoserver/tasks/geoserver.yml b/geoserver/geoserver/tasks/geoserver.yml
index 4371768..295d326 100644
--- a/geoserver/geoserver/tasks/geoserver.yml
+++ b/geoserver/geoserver/tasks/geoserver.yml
@@ -10,6 +10,11 @@
     - name: Create the Geoserver data directory
       file: path={{ geoserver_data_directory }} state=directory owner={{ item.user }} group={{ item.user }}
       with_items: '{{ tomcat_m_instances }}'
+      when: geoserver_create_data_dir
+
+    - name: Create the Geoserver log directory
+      file: path={{ geoserver_log_directory }} state=directory owner={{ item.user }} group={{ item.user }}
+      with_items: '{{ tomcat_m_instances }}'
       
     - name: Download the Geoserver file distribution
       unarchive: copy=no src={{ geoserver_download_url }} dest={{ geoserver_download_directory }} creates={{ geoserver_download_directory }}/geoserver.war validate_certs=False