diff --git a/gvaweb/webtasks/tasks.py b/gvaweb/webtasks/tasks.py
index 3da4812..61ddb66 100644
--- a/gvaweb/webtasks/tasks.py
+++ b/gvaweb/webtasks/tasks.py
@@ -77,10 +77,7 @@ def create_web_vhost_config(username, sitename, wildcard):
 
     """
     conftmpl = _get_template('vhost.nginx')
-    confdata = conftmpl.render(
-        domain=sitename, user=username,
-        docroot=_build_document_root_path(sitename, username),
-        wildcard=wildcard)
+    confdata = conftmpl.render(domain=sitename, wildcard=wildcard)
     conffile = None
     try:
         nginxtemp, filename = mkstemp()
diff --git a/gvaweb/webtasks/templates/vhost.nginx b/gvaweb/webtasks/templates/vhost.nginx
index 437614c..b06ee95 100644
--- a/gvaweb/webtasks/templates/vhost.nginx
+++ b/gvaweb/webtasks/templates/vhost.nginx
@@ -1,31 +1,23 @@
 server {
-    server_name {{ domain }};
-    {%- if wildcard %}
-    server_name *.{{ domain|parentdomain }};
-    {%- endif %}
+  {% if wildcard -%}
+  server_name .{{ domain|parentdomain }};
+  {% else -%}
+  server_name {{ domain }};
+  {% -endif %}
 
-    listen [::]:80;
+  listen 80;
+  listen [::]:80;
 
-    access_log /var/log/nginx/{{ domain }}.access.log;
-    error_log /var/log/nginx/{{ domain }}.error.log;
+  access_log /var/log/nginx/{{ domain }}.access.log;
+  error_log /var/log/nginx/{{ domain }}.error.log;
 
-    client_max_body_size 20M;
-    gzip on;
-    gzip_types text/javascript application/x-javascript text/css;
+  location /.well-known/acme-challenge {
+    root /srv/www/acme-challenge/{{ domain }};
+  }
 
-    root {{ docroot }};
-
-    index index.php index.html index.htm;
-
-    location ~ ^/(.+\.php)$ {
-        try_files $uri =404;
-        fastcgi_pass unix:/var/run/php5-fpm-{{ user }}.sock;
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        include fastcgi_params;
-    }
-
-    location ~ /\.ht {
-        deny all;
-    }
+  location / {
+    return 301 https://$host$request_uri;
+  }
 }
+
+# vim: ft=nginx et sw=4 ts=4 si ai