From 78c107d1c23ff81ab39714dd28207753b546c9d0 Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Thu, 8 Dec 2022 14:05:58 +0200
Subject: [PATCH] fix template

---
 templates/vhost.conf.j2 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/vhost.conf.j2 b/templates/vhost.conf.j2
index 9ff70db..5365fe5 100644
--- a/templates/vhost.conf.j2
+++ b/templates/vhost.conf.j2
@@ -9,8 +9,8 @@
     ServerAlias {% for alias in item.server_aliases %}{{ alias }} {% endfor %}
 {% endif %}
 
-  ## Directories, there should at least be a declaration for {{ item.docroot | default('/var/www/{{ item.vhostname }}') }}/
-  <Directory "{{ item.docroot | default('/var/www/{{ item.vhostname }}') }}/">
+  ## Directories, there should at least be a declaration for {{ item.docroot | default("/var/www/" + item.vhostname) }}/
+  <Directory "{{ item.docroot | default("/var/www/" + item.vhostname) }}/">
     Options +FollowSymlinks
     AllowOverride All
   </Directory>
@@ -26,7 +26,7 @@
 
 <VirtualHost *:{{ ssl_port|default("443") }}>
   ServerName {{ item.vhostname }}
-  ServerAdmin {{ item.serveradmin|default("webmaster@{{ item.vhostname }}") }}
+  ServerAdmin {{ item.serveradmin|default("webmaster@" + item.vhostname ) }}
 {% if item.server_aliases is defined %}
     ServerAlias {% for alias in item.server_aliases %}{{ alias }} {% endfor %}
 {% endif %}
@@ -37,11 +37,11 @@
 
 
 {% if item.docroot is defined %}  ## Vhost docroot
-  DocumentRoot "{{ item.docroot | default("/var/www/{{ item.vhostname }}") }}/"
+  DocumentRoot "{{ item.docroot | default("/var/www/" + item.vhostname ) }}/"
 
-  ## Directories, there should at least be a declaration for {{ item.docroot | default('/var/www/{{ item.vhostname }}') }}/
+  ## Directories, there should at least be a declaration for {{ item.docroot | default('/var/www/' + item.vhostname ) }}/
 
-  <Directory "{{ item.docroot | default('/var/www/{{ item.vhostname }}') }}/">
+  <Directory "{{ item.docroot | default('/var/www/' + item.vhostname ) }}/">
 {% if item.root_options is defined %}
     Options {% for option in item.root_options %}{{ option }} {% endfor %}
 {% endif %}