Implement optional suffix for /var/www

templates/etc-php5-apache2-php.ini

@@ -323,7 +323,7 @@ serialize_precision = 17
 ; *NOT* affected by whether Safe Mode is turned On or Off.
 ; http://php.net/open-basedir
 {% if item is defined and item.jail is defined %}
-open_basedir = {{ jailroot }}/{{ item.jail.name }}/var/www{{ item.root }}/:{{ jailroot }}/{{ item.jail.name }}/var/www/settings/:{{ jailroot }}/{{ item.jail.name }}/var/www/files/:{{ jailroot }}/{{ item.jail.name }}/tmp/
+open_basedir = {{ jailroot }}/{{ item.jail.name }}/var/www{{ item.webRoot|default("") }}{{ item.root }}/:{{ jailroot }}/{{ item.jail.name }}/var/www/settings/:{{ jailroot }}/{{ item.jail.name }}/var/www/files/:{{ jailroot }}/{{ item.jail.name }}/tmp/
 {% else %}
 ;open_basedir =
 {% endif %}
@@ -738,7 +738,7 @@ default_mimetype = "text/html"
 ; cgi.force_redirect configuration below
 ; http://php.net/doc-root
 {% if item is defined and item.jail is defined %}
-doc_root = {{ jailroot }}/{{ item.jail.name }}/var/www{{ item.docroot|default(item.root) }}
+doc_root = {{ jailroot }}/{{ item.jail.name }}/var/www{{ item.webRoot|default("") }}{{ item.docroot|default(item.root) }}
 {% else %}
 doc_root =
 {% endif %}