diff --git a/templates/etc/nginx/sites-available/COMMON.j2 b/templates/etc/nginx/sites-available/COMMON.j2
deleted file mode 100644
index ffed30d..0000000
--- a/templates/etc/nginx/sites-available/COMMON.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-{% set server_name = [ item.name ] %}
-{% set aliases = item.aliases if item.aliases is defined else [] %}
-{% set ignore = server_name.extend(aliases) %}
-
-{% if item.ssl is defined and item.ssl.use is defined and item.ssl.use %}
-	listen {{ item.listen | default('443') }};
-	server_name {{ server_name | join(' ') }};
-	ssl on;
-	ssl_certificate {{ nginx_ssl_dir }}/{{ item.name }}/{{ item.name }}.crt;
-	ssl_certificate_key {{ nginx_ssl_dir }}/{{ item.name }}/{{ item.name }}.key;
-	include /etc/nginx/helpers/ssl-{{ item.ssl.template | default('strong') }};
-{% else %}
-	listen {{ item.listen | default('80') }};
-	server_name {{ server_name | join(' ') }};
-{% endif %}
-
-{% if item.root is defined %}
-	root {{ item.root }};
-{% else %}
-	root {{ nginx_root }}/{{ item.name }}/public;
-{% endif %}
-
-{% if item.use_access_log is defined and item.use_access_log %}
-	access_log {{ nginx_log_dir }}/{{ item.name }}_access.log combined;
-{% else %}
-	access_log off;
-{% endif %}
-{% if item.use_error_log is defined and item.use_error_log %}
-	error_log {{ nginx_log_dir }}/{{ item.name }}_error.log {{ nginx_error_log_level }};
-{% else %}
-	error_log off;
-{% endif %}
diff --git a/templates/etc/nginx/sites-available/REDIRECT.j2 b/templates/etc/nginx/sites-available/REDIRECT.j2
deleted file mode 100644
index 57dbb4d..0000000
--- a/templates/etc/nginx/sites-available/REDIRECT.j2
+++ /dev/null
@@ -1,6 +0,0 @@
-{% if item.redirect_server_name is defined %}
-server {
-	server_name {{ item.redirect_server_name | join(' ') }};
-	return 301 {% if item.ssl.use %}https{% else %}http{% endif %}://{{ item.server_name[0] }}$request_uri;
-}
-{% endif %}
diff --git a/templates/etc/nginx/sites-available/_base.j2 b/templates/etc/nginx/sites-available/_base.j2
index cb01d52..0f44620 100644
--- a/templates/etc/nginx/sites-available/_base.j2
+++ b/templates/etc/nginx/sites-available/_base.j2
@@ -12,13 +12,11 @@ server {
 	listen {{ port }};
 {% endfor %}
 	server_name {{ item.name | join(' ') }};
-
 {% if item.root is defined %}
 	root {{ item.root }};
 {% else %}
 	root {{ nginx_root }}/{{ item.name[0] }}/public;
 {% endif %}
-
 {% block template_index %}
 	index {{ item.index | default('index.html index.htm') }};
 {% endblock %}
@@ -27,13 +25,22 @@ server {
 	try_files $uri $uri/ =404;
 {% endblock %}
 
+{% block template_upstream_location %}
+{% endblock %}
 {% block template_custom_location %}
 {% endblock %}
 
 	location  ~ /\.ht {
 		deny all;
 	}
-	location ~* \.(txt|js|css|png|jpg|jpeg|gif|ico|svg)$ {
+
+	location = /favicon.ico {
+		expires 30d;
+		access_log off;
+		log_not_found off;
+	}
+
+	location ~* \.(txt|js|css|png|jpe?g|gif|ico|svg)$ {
 		expires 30d;
 		log_not_found off;
 	}
@@ -50,6 +57,14 @@ server {
 {% endif %}
 }
 
+{#
+ssl on;
+ssl_certificate {{ nginx_ssl_dir }}/{{ item.name }}/{{ item.name }}.crt;
+ssl_certificate_key {{ nginx_ssl_dir }}/{{ item.name }}/{{ item.name }}.key;
+include /etc/nginx/helpers/ssl-{{ item.ssl.template | default('strong') }};
+#}
+
+
 # HTTPS
 #server {
 #}
diff --git a/templates/etc/nginx/sites-available/_dokuwiki.j2 b/templates/etc/nginx/sites-available/_dokuwiki.j2
new file mode 100644
index 0000000..41afda1
--- /dev/null
+++ b/templates/etc/nginx/sites-available/_dokuwiki.j2
@@ -0,0 +1,22 @@
+{% extends "_php.j2" %}
+
+{% block template_index %}
+	index doku.php;
+{% endblock %}
+
+{% block template_try_files %}
+	try_files $uri $uri/ @dokuwiki =404;
+{% endblock %}
+
+{% block template_custom_location %}
+	location @dokuwiki {
+		rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
+		rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
+		rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
+		rewrite ^/(.*) /doku.php?id=$1 last;
+	}
+
+	location ~ /(data|conf|bin|inc)/ {
+		deny all;
+	}
+{% endblock %}
diff --git a/templates/etc/nginx/sites-available/_php.j2 b/templates/etc/nginx/sites-available/_php.j2
index 2bcd7ba..eb82aac 100644
--- a/templates/etc/nginx/sites-available/_php.j2
+++ b/templates/etc/nginx/sites-available/_php.j2
@@ -7,7 +7,7 @@
 	try_files $uri $uri/ index.php;
 {% endblock %}
 
-{% block template_custom_location %}
+{% block template_upstream_location %}
 	location ~ \.php$ {
 		fastcgi_pass php;
 		fastcgi_index index.php;
diff --git a/templates/etc/nginx/sites-available/_wordpress.j2 b/templates/etc/nginx/sites-available/_wordpress.j2
new file mode 100644
index 0000000..549351c
--- /dev/null
+++ b/templates/etc/nginx/sites-available/_wordpress.j2
@@ -0,0 +1,5 @@
+{% extends "_php.j2" %}
+
+{% block template_try_files %}
+	try_files $uri $uri/ index.php?$args;
+{% endblock %}
diff --git a/templates/etc/nginx/sites-available/simple-php.j2 b/templates/etc/nginx/sites-available/simple-php.j2
deleted file mode 100644
index d98af9f..0000000
--- a/templates/etc/nginx/sites-available/simple-php.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# {{ ansible_managed }}
-#
-
-server {
-{% include 'COMMON.j2' %}
-
-	index index.htm index.html index.php;
-	location / {
-		try_files $uri $uri/ /index.php;
-	}
-	include /etc/nginx/helpers/php;
-	include /etc/nginx/helpers/no-ht;
-	include /etc/nginx/helpers/static-expires;
-}
-
-{% include 'REDIRECT.j2' %}
-
-# vim:filetype=nginx
diff --git a/templates/etc/nginx/sites-available/static.j2 b/templates/etc/nginx/sites-available/static.j2
deleted file mode 100644
index e449c5d..0000000
--- a/templates/etc/nginx/sites-available/static.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# {{ ansible_managed }}
-#
-
-server {
-{% include 'COMMON.j2' %}
-
-	index index.htm index.html;
-
-	location / {
-		try_files $uri $uri/ =404;
-	}
-	include /etc/nginx/helpers/static-expires;
-	include /etc/nginx/helpers/no-ht;
-}
-
-{% include 'REDIRECT.j2' %}
-
-# vim:filetype=nginx
diff --git a/templates/etc/nginx/sites-available/wordpress.j2 b/templates/etc/nginx/sites-available/wordpress.j2
deleted file mode 100644
index 3929170..0000000
--- a/templates/etc/nginx/sites-available/wordpress.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# {{ ansible_managed }}
-#
-
-server {
-{% include 'COMMON.j2' %}
-
-	index index.htm index.html index.php;
-
-	location / {
-		try_files $uri $uri/ /index.php?q=$uri&$args;
-	}
-	include /etc/nginx/helpers/static-expires;
-	include /etc/nginx/helpers/no-ht;
-	include /etc/nginx/helpers/php;
-}
-
-{% include 'REDIRECT.j2' %}
-
-# vim:filetype=nginx
diff --git a/tests/test.yml b/tests/test.yml
index d175965..ce47ace 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -18,13 +18,9 @@
           - 'test-alias.local'
           - 'test2-alias.local'
         template: '_base'
-        ssl:
-          use: false
       - name:
           - 'test-php.local'
         template: '_php'
-        ssl:
-          use: false
   roles:
     - ../../
   post_tasks: