diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm index 4506cafd634189b6be65cf278b1d11fa8909dc6f..b01e7e255c82007a9c974a794a84a0907ffc46d6 100644 --- a/interface/web/admin/templates/directive_snippets_edit.htm +++ b/interface/web/admin/templates/directive_snippets_edit.htm @@ -11,8 +11,8 @@ 
{tmpl_var name='snippet'}
-   Nginx {tmpl_var name='variables_txt'}: {DOCROOT}, {FASTCGIPASS}, {PHPFALLBACKFASTCGIPASS}
-   Apache {tmpl_var name='variables_txt'}: {DOCROOT}, {DOCROOT_CLIENT}
+   Nginx {tmpl_var name='variables_txt'}: {DOCROOT}, {DOMAIN}, {FASTCGIPASS}, {PHPFALLBACKFASTCGIPASS}
+   Apache {tmpl_var name='variables_txt'}: {DOCROOT}, {DOCROOT_CLIENT}, {DOMAIN}
  PHP {tmpl_var name='variables_txt'}: {WEBROOT}
@@ -38,23 +38,23 @@
-
{tmpl_var name='update_sites'}
-
- +
{tmpl_var name='update_sites'}
+ + - +
diff --git a/interface/web/sites/templates/web_vhost_domain_advanced.htm b/interface/web/sites/templates/web_vhost_domain_advanced.htm index f1df422bad7f01ec2bb6bbc741b154b87d739aa8..e878a06fbbc6477d818f70c348188fdd7af5c96d 100644 --- a/interface/web/sites/templates/web_vhost_domain_advanced.htm +++ b/interface/web/sites/templates/web_vhost_domain_advanced.htm @@ -1,198 +1,206 @@ -
-

{tmpl_var name='configuration_error_txt'}

-
-
{tmpl_var name='config_error_tstamp'} : 
{tmpl_var name='config_error_msg'}
-
-
+
+

{tmpl_var name='configuration_error_txt'}

+
+
{tmpl_var name='config_error_tstamp'} : 
+
{tmpl_var name='config_error_msg'}
+
+
+ +
+ +
+
+
+ +
+
+
+ +
+
   {tmpl_var name='system_user'}
+
+ +
+
+ +
+
   {tmpl_var name='system_group'}
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+ {tmpl_var name='proxy_protocol'} +
+
+
+
+ +
+ {tmpl_var name='php_fpm_use_socket'} +
+
+
+ +
+ {tmpl_var name='php_fpm_chroot'} +
+
+
+ +
+
+
+
+ {tmpl_var name='pm_ondemand_hint_txt'} +
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
 s +
+
+
+ +
+
+
+
+ +
+
+
+ +
+ {tmpl_var name="available_php_directive_snippets_txt"}

 {tmpl_var name="php_directive_snippets_txt"} +
+
+
+ +
+ {tmpl_var name="available_apache_directive_snippets_txt"}

 {tmpl_var name="apache_directive_snippets_txt"}
----
 {tmpl_var name='variables_txt'}: {DOCROOT}, {DOCROOT_CLIENT}, {DOMAIN} +
+
+
+ +
+ {tmpl_var name="available_nginx_directive_snippets_txt"}

 {tmpl_var name="nginx_directive_snippets_txt"}
----
 {tmpl_var name='variables_txt'}: {DOCROOT}, {DOCROOT_CLIENT}, {DOMAIN}, {FASTCGIPASS}, {PHPFALLBACKFASTCGIPASS} +
+
+
+ +
+ {tmpl_var name="available_proxy_directive_snippets_txt"}

 {tmpl_var name="proxy_directive_snippets_txt"} +
+
+ +
+
+ + +
+
+ diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index f11476b4021f3a224d763b646433e66347b4066d..ade1841a2b507e91136b163b864e694a86518885 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -1243,7 +1243,8 @@ class apache2_plugin { $vhost_data['apache_directives'] = str_replace("\r", "\n", $vhost_data['apache_directives']); $trans = array( '{DOCROOT}' => $vhost_data['web_document_root_www'], - '{DOCROOT_CLIENT}' => $vhost_data['web_document_root'] + '{DOCROOT_CLIENT}' => $vhost_data['web_document_root'], + '{DOMAIN}' => $vhost_data['domain'] ); $vhost_data['apache_directives'] = strtr($vhost_data['apache_directives'], $trans); @@ -3084,7 +3085,7 @@ class apache2_plugin { /* In case that you use a different log format, you should use a custom goaccess.conf which you'll have to put into /usr/local/ispconfig/server/conf-custom/. - By default the originaly with GoAccess shipped goaccess.conf from /etc/ will be used along with the log-format value COMBINED. + By default the originaly with GoAccess shipped goaccess.conf from /etc/ will be used along with the log-format value COMBINED. */ if(file_exists("/usr/local/ispconfig/server/conf-custom/goaccess.conf.master")) { @@ -3116,7 +3117,7 @@ class apache2_plugin { if(is_file($goaccess_conf) && (filesize($goaccess_conf) > 0)) { $app->log('Created GoAccess config file: '.$goaccess_conf, LOGLEVEL_DEBUG); - } + } if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html"); if(file_exists("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master")) { diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 4b20a0339167f0ea41cf64c8bbc723ca0bba9be7..e152f6e3bec3201a605331ea3c84d7b0bd07f63b 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -1298,6 +1298,7 @@ class nginx_plugin { $trans = array( '{DOCROOT}' => $vhost_data['web_document_root_www'], '{DOCROOT_CLIENT}' => $vhost_data['web_document_root'], + '{DOMAIN}' => $vhost_data['domain'], '{FASTCGIPASS}' => 'fastcgi_pass '.($data['new']['php_fpm_use_socket'] == 'y'? 'unix:'.$fpm_socket : '127.0.0.1:'.$vhost_data['fpm_port']).';' ); foreach($nginx_directive_lines as $nginx_directive_line){ @@ -2597,7 +2598,7 @@ class nginx_plugin { $goaccess_conf_main = $goa_loc; break; } else { - $count++; + $count++; if($count == 2) { $app->log("No GoAccess base config found. Make sure that GoAccess is installed and that the goaccess.conf does exist in /etc or /etc/goaccess", LOGLEVEL_WARN); } @@ -2609,7 +2610,7 @@ class nginx_plugin { /* In case that you use a different log format, you should use a custom goaccess.conf which you'll have to put into /usr/local/ispconfig/server/conf-custom/. - By default the originaly with GoAccess shipped goaccess.conf from /etc/ will be used along with the log-format value COMBINED. + By default the originaly with GoAccess shipped goaccess.conf from /etc/ will be used along with the log-format value COMBINED. */ if(file_exists("/usr/local/ispconfig/server/conf-custom/goaccess.conf.master")) {