Reorganize file system layout

bin/v-add-web-domain-ssl

@@ -78,11 +78,11 @@ fi
 chmod 660 $USER_DATA/ssl/$domain.*
 
 # Adding certificate to user dir
-cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
-cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
-cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
+cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
+cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
+cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
 if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
-    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
+    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
 fi
 
 # Parsing domain values

bin/v-backup-user

@@ -145,7 +145,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
         else
             # old style configs
             tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.tpl"
-            conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+            conf="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf"
             get_web_config_lines $tpl_file $conf
             sed -n "$top_line,$bottom_line p" $conf > conf/$WEB_SYSTEM.conf
         fi
@@ -157,7 +157,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
                 cp $conf conf/$WEB_SYSTEM.ssl.conf
             else
                 tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl"
-                conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+                conf="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf"
                 get_web_config_lines $tpl_file $conf
                 sed -n "$top_line,$bottom_line p" $conf > \
                     conf/s$WEB_SYSTEM.conf
@@ -171,7 +171,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
                 cp $conf conf/$PROXY_SYSTEM.conf
             else
                 tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl"
-                conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+                conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf"
                 get_web_config_lines $tpl_file $conf
                 sed -n "$top_line,$bottom_line p" $conf > \
                     conf/$PROXY_SYSTEM.conf
@@ -185,7 +185,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
                 cp $conf conf/$PROXY_SYSTEM.ssl.conf
             else
                 tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl"
-                conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+                conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf"
                 get_web_config_lines $tpl_file $conf
                 sed -n "$top_line,$bottom_line p" $conf >\
                     conf/s$PROXY_SYSTEM.conf
@@ -199,7 +199,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
 
         # Backup ssl certificates
         if [ "$SSL" = 'yes' ] ; then
-            cp $HOMEDIR/$user/conf/web/ssl.$domain.* conf/
+            cp $HOMEDIR/$user/conf/web/$domain/ssl/$domain.* conf/
             cp $USER_DATA/ssl/$domain.* hestia/
         fi
 

bin/v-change-web-domain-name

@@ -80,7 +80,7 @@ if [ -e "$USER_DATA/ssl/$domain.crt" ]; then
     mv $domain.ca $new_domain.ca
     mv $domain.pem $new_domain.pem
     mv $domain.key $new_domain.key
-    rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+    rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
 fi
 
 

bin/v-change-web-domain-sslcert

@@ -49,7 +49,7 @@ is_web_domain_cert_valid
 
 # Deleting old certificate
 tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
-rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
 mv $USER_DATA/ssl/$domain.* $tmpdir
 chown -R $user:$user $tmpdir
 
@@ -63,11 +63,11 @@ if [ -e "$ssl_dir/$domain.ca" ]; then
 fi
 
 # Adding new certificate to user dir
-cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
-cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
-cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
+cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
+cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
+cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
 if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
-    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
+    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
 fi
 
 

bin/v-delete-web-domain

@@ -66,7 +66,7 @@ del_web_config "$WEB_SYSTEM" "$TPL.tpl"
 if [ "$SSL" = 'yes' ]; then
     del_web_config "$WEB_SYSTEM" "$TPL.stpl"
     $BIN/v-delete-web-domain-ssl-force $user $domain
-    rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+    rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
     rm -f $USER_DATA/ssl/$domain.*
 fi
 

bin/v-delete-web-domain-ssl

@@ -57,7 +57,7 @@ fi
 
 # Deleting old certificate
 tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
-rm -f $HOMEDIR/$user/conf/web/ssl.$domain.*
+rm -f $HOMEDIR/$user/conf/web/$domain/ssl/$domain.*
 mv $USER_DATA/ssl/$domain.* $tmpdir
 chown -R $user:$user $tmpdir
 

bin/v-rebuild-web-domains

@@ -38,23 +38,23 @@ is_object_unsuspended 'user' 'USER' "$user"
 
 # Deleting old web configs
 sed -i "/.*\/$user\/conf\/web\//d" /etc/$WEB_SYSTEM/conf.d/hestia.conf
-if [ -e "$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"  ]; then
-    rm $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf
+if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf"  ]; then
+    rm $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf
 fi
-if [ -e "$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf" ]; then
-    rm $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
+if [ -e "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf" ]; then
+    rm $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf
 fi
 
 # Deleting old proxy configs
 if [ ! -z "$PROXY_SYSTEM" ]; then
     sed -i "/.*\/$user\/conf\/web\//d" /etc/$PROXY_SYSTEM/conf.d/hestia.conf
 
-    if [ -e "$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" ]; then
-        rm $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf
+    if [ -e "$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf" ]; then
+        rm $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf
     fi
 
-    if [ -e "$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" ]; then
-        rm $HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf
+    if [ -e "$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf" ]; then
+        rm $HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf
     fi
 fi
 

bin/v-update-web-domain-ssl

@@ -65,11 +65,11 @@ chmod 660 $USER_DATA/ssl/$domain.*
 
 
 # Adding certificate to user dir
-cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt
-cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key
-cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem
+cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
+cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
+cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
 if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
-    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca
+    cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
 fi
 
 

func/domain.sh

@@ -173,10 +173,10 @@ prepare_web_domain_values() {
     ssl_ca_str=''
     prepare_web_aliases $ALIAS
 
-    ssl_crt="$HOMEDIR/$user/conf/web/ssl.$domain.crt"
-    ssl_key="$HOMEDIR/$user/conf/web/ssl.$domain.key"
-    ssl_pem="$HOMEDIR/$user/conf/web/ssl.$domain.pem"
-    ssl_ca="$HOMEDIR/$user/conf/web/ssl.$domain.ca"
+    ssl_crt="$HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt"
+    ssl_key="$HOMEDIR/$user/conf/web/$domain/ssl/$domain.key"
+    ssl_pem="$HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem"
+    ssl_ca="$HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca"
     if [ ! -e "$USER_DATA/ssl/$domain.ca" ]; then
         ssl_ca_str='#'
     fi
@@ -188,9 +188,9 @@ prepare_web_domain_values() {
 
 # Add web config
 add_web_config() {
-    conf="$HOMEDIR/$user/conf/web/$domain.$1.conf"
+    conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
     if [[ "$2" =~ stpl$ ]]; then
-        conf="$HOMEDIR/$user/conf/web/$domain.$1.ssl.conf"
+        conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
     fi
 
     domain_idn=$domain
@@ -228,12 +228,10 @@ add_web_config() {
     chown root:$user $conf
     chmod 640 $conf
 
-    if [ -z "$(grep "$conf" /etc/$1/conf.d/hestia.conf)" ]; then
-        if [ "$1" != 'nginx' ]; then
-            echo "Include $conf" >> /etc/$1/conf.d/hestia.conf
-        else
-            echo "include $conf;" >> /etc/$1/conf.d/hestia.conf
-        fi
+    if [ "$1" != 'nginx' ]; then
+        ln -s $HOMEDIR/$user/conf/web/$domain/$1.conf /etc/$1/conf.d/domains/$domain.conf
+    else
+        ln -s $HOMEDIR/$user/conf/web/$domain/$1.conf /etc/$1/conf.d/domains/$domain.conf
     fi
 
     trigger="${2/.*pl/.sh}"
@@ -272,9 +270,9 @@ get_web_config_lines() {
 
 # Replace web config
 replace_web_config() {
-    conf="$HOMEDIR/$user/conf/web/$domain.$1.conf"
+    conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
     if [[ "$2" =~ stpl$ ]]; then
-        conf="$HOMEDIR/$user/conf/web/$domain.$1.ssl.conf"
+        conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
     fi
 
     if [ -e "$conf" ]; then
@@ -292,9 +290,9 @@ replace_web_config() {
 
 # Delete web configuration
 del_web_config() {
-    conf="$HOMEDIR/$user/conf/web/$domain.$1.conf"
+    conf="$HOMEDIR/$user/conf/web/$domain/$1.conf"
     if [[ "$2" =~ stpl$ ]]; then
-        conf="$HOMEDIR/$user/conf/web/$domain.$1.ssl.conf"
+        conf="$HOMEDIR/$user/conf/web/$domain/$1.ssl.conf"
     fi
 
     if [ -e "$conf" ]; then

func/rebuild.sh

@@ -202,31 +202,31 @@ rebuild_web_domain_conf() {
     chown root:$user /var/log/$WEB_SYSTEM/domains/$domain.*
 
     # Adding vhost configuration
-    conf="$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf"
+    conf="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.conf"
     add_web_config "$WEB_SYSTEM" "$TPL.tpl"
 
     # Adding SSL vhost configuration
     if [ "$SSL" = 'yes' ]; then
-        conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf"
+        conf="$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.ssl.conf"
         add_web_config "$WEB_SYSTEM" "$TPL.stpl"
         cp -f $USER_DATA/ssl/$domain.crt \
-            $HOMEDIR/$user/conf/web/ssl.$domain.crt
+            $HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt
         cp -f $USER_DATA/ssl/$domain.key \
-            $HOMEDIR/$user/conf/web/ssl.$domain.key
+            $HOMEDIR/$user/conf/web/$domain/ssl/$domain.key
         cp -f $USER_DATA/ssl/$domain.pem \
-            $HOMEDIR/$user/conf/web/ssl.$domain.pem
+            $HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem
         if [ -e "$USER_DATA/ssl/$domain.ca" ]; then
             cp -f $USER_DATA/ssl/$domain.ca \
-                $HOMEDIR/$user/conf/web/ssl.$domain.ca
+                $HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca
         fi
     fi
 
     # Adding proxy configuration
     if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then
-        conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf"
+        conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.conf"
         add_web_config "$PROXY_SYSTEM" "$PROXY.tpl"
         if [ "$SSL" = 'yes' ]; then
-            conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf"
+            conf="$HOMEDIR/$user/conf/web/$domain/$PROXY_SYSTEM.ssl.conf"
             add_web_config "$PROXY_SYSTEM" "$PROXY.stpl"
         fi
     fi

install/deb/apache2/apache2.conf

@@ -81,6 +81,7 @@ LogFormat "%{User-agent}i" agent
 LogFormat "%b" bytes
 
 Include conf.d/
+IncludeOptional conf.d/domains/*.conf
 
 # Include the virtual host configurations:
 #Include sites-enabled/

install/deb/multiphp/apache2/PHP-56.stpl

@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-56.tpl

@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-70.stpl

@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-70.tpl

@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-71.stpl

@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-71.tpl

@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-72.stpl

@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-72.tpl

@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-73.stpl

@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/multiphp/apache2/PHP-73.tpl

@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/multiphp/nginx/PHP-56.stpl

@@ -50,5 +50,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/multiphp/nginx/PHP-56.tpl

@@ -49,5 +49,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/multiphp/nginx/PHP-70.stpl

@@ -50,5 +50,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/multiphp/nginx/PHP-70.tpl

@@ -49,5 +49,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/multiphp/nginx/PHP-71.stpl

@@ -50,5 +50,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/multiphp/nginx/PHP-71.tpl

@@ -49,5 +49,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/multiphp/nginx/PHP-72.stpl

@@ -50,5 +50,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/multiphp/nginx/PHP-72.tpl

@@ -49,5 +49,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/multiphp/nginx/PHP-73.stpl

@@ -50,5 +50,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/multiphp/nginx/PHP-73.tpl

@@ -49,5 +49,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/nginx/nginx.conf

@@ -149,4 +149,5 @@ http {
 
     # Wildcard include
     include             /etc/nginx/conf.d/*.conf;
+    include             /etc/nginx/conf.d/domains/*.conf;
 }

install/deb/templates/web/apache2/default.stpl

@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/templates/web/apache2/default.tpl

@@ -34,7 +34,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/templates/web/apache2/hosting.stpl

@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/templates/web/apache2/hosting.tpl

@@ -40,7 +40,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/templates/web/apache2/phpcgi.stpl

@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/templates/web/apache2/phpcgi.tpl

@@ -28,7 +28,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/templates/web/apache2/phpfcgid.stpl

@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
 
 </VirtualHost>
 

install/deb/templates/web/apache2/phpfcgid.tpl

@@ -28,7 +28,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
 
 </VirtualHost>
 

install/deb/templates/web/nginx/caching.stpl

@@ -39,5 +39,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/caching.tpl

@@ -38,5 +38,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/default.stpl

@@ -30,6 +30,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }
 

install/deb/templates/web/nginx/default.tpl

@@ -29,6 +29,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.conf*;
 }
 

install/deb/templates/web/nginx/hosting.stpl

@@ -32,6 +32,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }
 

install/deb/templates/web/nginx/hosting.tpl

@@ -31,6 +31,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.conf*;
 }
 

install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl

@@ -50,5 +50,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/codeigniter2.stpl

@@ -56,5 +56,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/codeigniter2.tpl

@@ -55,5 +55,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/codeigniter3.stpl

@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/codeigniter3.tpl

@@ -50,5 +50,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl

@@ -122,5 +122,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl

@@ -121,5 +121,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/default.stpl

@@ -50,5 +50,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/default.tpl

@@ -49,5 +49,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl

@@ -67,5 +67,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl

@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/drupal6.stpl

@@ -90,5 +90,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/drupal6.tpl

@@ -89,5 +89,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/drupal7.stpl

@@ -90,5 +90,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/drupal7.tpl

@@ -89,5 +89,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/drupal8.stpl

@@ -90,5 +90,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/drupal8.tpl

@@ -89,5 +89,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/joomla.stpl

@@ -58,5 +58,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/joomla.tpl

@@ -57,5 +57,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/laravel.stpl

@@ -51,5 +51,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/laravel.tpl

@@ -48,5 +48,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/magento.stpl

@@ -193,5 +193,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/magento.tpl

@@ -192,5 +192,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/modx.stpl

@@ -64,5 +64,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/modx.tpl

@@ -63,5 +63,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/moodle.stpl

@@ -85,5 +85,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/moodle.tpl

@@ -85,5 +85,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/no-php.stpl

@@ -42,5 +42,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/no-php.tpl

@@ -41,5 +41,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/odoo.stpl

@@ -65,5 +65,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/odoo.tpl

@@ -64,5 +64,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/opencart.stpl

@@ -54,5 +54,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/opencart.tpl

@@ -52,5 +52,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/owncloud.stpl

@@ -80,5 +80,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/owncloud.tpl

@@ -79,5 +79,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/piwik.stpl

@@ -68,5 +68,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/piwik.tpl

@@ -67,5 +67,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/pyrocms.stpl

@@ -61,5 +61,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/snginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
 }

install/deb/templates/web/nginx/php-fpm/pyrocms.tpl

@@ -60,5 +60,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/sendy.stpl

@@ -84,5 +84,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }

install/deb/templates/web/nginx/php-fpm/sendy.tpl

@@ -84,5 +84,5 @@ server {
     include     /etc/nginx/conf.d/phppgadmin.inc*;
     include     /etc/nginx/conf.d/webmail.inc*;
 
-    include     %home%/%user%/conf/web/nginx.%domain%.conf*;
+    include     %home%/%user%/conf/web/%domain%/nginx.conf*;
 }