added %elog% variable

Author: serghey-rodin

data/templates/apache_default.stpl

@@ -10,7 +10,7 @@
     SuexecUserGroup %user% %group%
     CustomLog /var/log/httpd/domains/%domain%.bytes bytes
     CustomLog /var/log/httpd/domains/%domain%.log combined
-    #ErrorLog /var/log/httpd/domains/%domain%.error.log
+   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
         SSLRequireSSL

data/templates/apache_default.tpl

@@ -10,7 +10,7 @@
     SuexecUserGroup %user% %group%
     CustomLog /var/log/httpd/domains/%domain%.bytes bytes
     CustomLog /var/log/httpd/domains/%domain%.log combined
-    #ErrorLog /var/log/httpd/domains/%domain%.error.log
+   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
         Options +Includes -Indexes +ExecCGI

data/templates/apache_phpcgi.stpl

@@ -10,7 +10,7 @@
     SuexecUserGroup %user% %group%
     CustomLog /var/log/httpd/domains/%domain%.bytes bytes
     CustomLog /var/log/httpd/domains/%domain%.log combined
-    #ErrorLog /var/log/httpd/domains/%domain%.error.log
+   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
         SSLRequireSSL

data/templates/apache_phpcgi.tpl

@@ -10,7 +10,7 @@
     SuexecUserGroup %user% %group%
     CustomLog /var/log/httpd/domains/%domain%.bytes bytes
     CustomLog /var/log/httpd/domains/%domain%.log combined
-    #ErrorLog /var/log/httpd/domains/%domain%.error.log
+   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride AuthConfig FileInfo Indexes Limit
         Options +Includes -Indexes +ExecCGI

data/templates/apache_unlim.stpl

@@ -10,7 +10,7 @@
     SuexecUserGroup %user% %group%
     CustomLog /var/log/httpd/domains/%domain%.bytes bytes
     CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride All
         SSLRequireSSL

data/templates/apache_unlim.tpl

@@ -10,7 +10,7 @@
     SuexecUserGroup %user% %group%
     CustomLog /var/log/httpd/domains/%domain%.bytes bytes
     CustomLog /var/log/httpd/domains/%domain%.log combined
-    ErrorLog /var/log/httpd/domains/%domain%.error.log
+   %elog%ErrorLog /var/log/httpd/domains/%domain%.error.log
     <Directory %docroot%>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI

data/templates/ngingx_vhost_default.stpl

@@ -1,11 +1,11 @@
 server {
-    listen      %ip%:%proxy_port%;
+    listen      %ip%:%proxy_ssl_port%;
     server_name %domain_idn% %alias_idn%;
     server_name_in_redirect off;
-    #error_log  /var/log/httpd/domains/%domain%.error.log error;
+   %elog%error_log  /var/log/httpd/domains/%domain%.error.log error;
 
     location / {
-        proxy_pass     http://%ip%:%web_port%;
+        proxy_pass     http://%ip%:%web_ssl_port%;
 
         location ~* ^.+\.(%extentions%)$ {
             root           %docroot%;
@@ -22,11 +22,12 @@ server {
     }
 
     location @fallback {
-        proxy_pass      http://%ip%:%web_port%;
+        proxy_pass      http://%ip%:%web_ssl_port%;
     }
 
     location ~ /\.ht   {deny all;}
     location ~ /.svn/  {deny all;}
 
-    Include %home%/%user%/conf/%domain%.nginx.*
+    include %home%/%user%/conf/%domain%.nginx.*;
 }
+

data/templates/ngingx_vhost_default.tpl

@@ -1,11 +1,11 @@
 server {
-    listen      %ip%:%proxy_ssl_port%;
+    listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     server_name_in_redirect off;
-    #error_log  /var/log/httpd/domains/%domain%.error.log error;
+   %elog%error_log  /var/log/httpd/domains/%domain%.error.log error;
 
     location / {
-        proxy_pass     http://%ip%:%web_ssl_port%;
+        proxy_pass     http://%ip%:%web_port%;
 
         location ~* ^.+\.(%extentions%)$ {
             root           %docroot%;
@@ -22,11 +22,12 @@ server {
     }
 
     location @fallback {
-        proxy_pass      http://%ip%:%web_ssl_port%;
+        proxy_pass      http://%ip%:%web_port%;
     }
 
     location ~ /\.ht   {deny all;}
     location ~ /.svn/  {deny all;}
 
-    Include %home%/%user%/conf/%domain%.nginx.*
+    include %home%/%user%/conf/%domain%.nginx.*;
 }
+

func/domain_func.sh

@@ -238,7 +238,8 @@ httpd_add_config() {
             -e "s/%alias%/${aliases//,/ }/g" \
             -e "s/%ssl_cert%/${ssl_cert////\/}/g" \
             -e "s/%ssl_key%/${ssl_key////\/}/g" \
-            -e "s/%extentions%/$extentions/g" \
+            -e "s/%extentions%/${extentions//,/|}/g" \
+            -e "s/%elog%/$elog/g" \
     >> $conf
 }