General improvements

templates/etc_apache2_sites_available_vhost

@@ -3,9 +3,20 @@
   ServerName  {{ item.domains.0.domain }}
   ServerAlias{% for domain in item.domains %} {{ domain.domain }}{% for alias in domain.aliases %} {{ alias }}{% endfor %}{% endfor %}
 
-  DocumentRoot /var/www/{{ item.root }}
+{% if item.jail is defined %}
+{% set prefix = item.jail.name ~ "-" %}
+{% set docRoot = jailroot ~ "/" ~ item.jail.name ~ "/var/www" %}
+  <ifmodule mpm_itk_module>
+    AssignUserID {{ item.jail.name item.jail.name }}
+  </ifmodule>
 
-  <Directory /var/www/{{ item.root }}/>
+{% else %}
+{% set prefix = '' %}
+{% set docRoot = '/var/www/'{{ item.root }} %}
+{% endif %}
+  DocumentRoot {{ docRoot }}
+
+  <Directory {{ docRoot }}/>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride All
 {% if item.apache_auth is defined %}
@@ -19,7 +30,7 @@
 {% endif %}
   </Directory>
 
-  ErrorLog ${APACHE_LOG_DIR}/error.log
+  ErrorLog ${APACHE_LOG_DIR}/{{ prefix }}error.log
   LogLevel warn
   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
   SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded