diff --git a/conf/nginx.conf b/conf/nginx.conf
index 25da4064..a16e1372 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -57,6 +57,7 @@ server {
 			deny all;
 	 	}
 	}
+
 	location ~ ^(/cloud)(/.+\.php)(/.*)?$ {
 		# note: ~ has precendence over a regular location block
 		include fastcgi_params;
@@ -71,12 +72,20 @@ server {
 		client_max_body_size 1G;
 		fastcgi_buffers 64 4K;
 	}
+
 	location ~ ^/((caldav|carddav|webdav).*)$ {
 		# Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either.
 		# Properly proxying like this seems to work fine.
 		proxy_pass https://$HOSTNAME/cloud/remote.php/$1;
 	}
 
+#	location ^~ /cloud/data {
+#		internal;
+#		# Set 'alias' if not using the default 'datadirectory'
+#		# TODO: Since this is auto generated, we need a better approach!
+#		alias /home/user-data/owncloud;
+#	}
+
 	rewrite ^/.well-known/host-meta /cloud/public.php?service=host-meta last;
 	rewrite ^/.well-known/host-meta.json /cloud/public.php?service=host-meta-json last;
 	rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect;