@@ -1617,19 +1617,24 @@ function update($event_name, $data) {
16171617 $ nginx_openssl_running_ver$ appsystem ->exec_safe ('nginx -V 2>&1 | grep \'running with OpenSSL \' | sed \'s/.*running\([a-zA-Z ]*\)OpenSSL \([0-9.]*\).*/\2/ \'' );
16181618 if (version_compare ($ appsystem ->getnginxversion (true ), '1.13.0 ' , '>= ' )
16191619 && version_compare ($ nginx_openssl_build_ver'1.1.1 ' , '>= ' )
1620- && (empty ($ nginx_openssl_running_verversion_compare ($ nginx_openssl_running_ver'1.1.1 ' , '>= ' ))) {
1620+ && (empty ($ nginx_openssl_running_verversion_compare ($ nginx_openssl_running_ver'1.1.1 ' , '>= ' ))
1621+ && $ data'new ' ]['ssl ' ] == 'y ' ) {
16211622 $ applog ('Enable TLS 1.3 for: ' .$ domainLOGLEVEL_DEBUG );
16221623 $ vhost_data'tls13_supported ' ] = "y " ;
16231624 }
16241625
1625- // Nginx >= 1.25.0 uses a dedicated directive to enable HTTP/2 support
1626- if (version_compare ($ appsystem ->getnginxversion (true ), '1.25.0 ' , '>= ' )) {
1627- $ vhost_data'http2_directive_compat_quirk ' ] = "y " ;
16281626
1627+
1628+ // Nginx >= 1.25.1 uses a dedicated directive to enable HTTP/2 support
1629+ if (version_compare ($ appsystem ->getnginxversion (true ), '1.25.1 ' , '< ' )) {
1630+ $ vhost_data'http2_directive_compat_quirk ' ] = " http2 " ;
16291631 }
16301632
16311633 $ tplsetVar ($ vhost_data
16321634
1635+ $ tplsetVar ('nginx_version ' , $ appsystem ->getnginxversion ());
1636+ $ tplsetVar ('nginx_full_version ' , $ appsystem ->getnginxversion (true ));
1637+
16331638 $ server_aliasarray ();
16341639
16351640 // get autoalias
@@ -2630,96 +2635,92 @@ function _create_web_folder_auth_configuration($website){
26302635
26312636 //* Update the GoAccess configuration file
26322637 private function goaccess_update ($ data$ web_config
2633- global $ app
2634-
2635- $ web_folder$ data'new ' ]['web_folder ' ];
2636- if ($ data'new ' ]['type ' ] == 'vhost ' ) $ web_folder'web ' ;
2637-
2638- $ goaccess_conf_locsarray ('/etc/goaccess.conf ' , '/etc/goaccess/goaccess.conf ' );
2639- $ count0 ;
2640-
2641- foreach ($ goaccess_conf_locsas $ goa_loc
2642- if (is_file ($ goa_locfilesize ($ goa_loc0 )) {
2643- $ goaccess_conf_main$ goa_loc
2644- break ;
2645- } else {
2646- $ count
2647- if ($ count2 ) {
2648- $ applog ("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 );
2649- }
2650- }
2651- }
2652-
2653- if (!is_dir ($ data'new ' ]['document_root ' ] . "/log/goaccess_db " )) $ appsystem ->mkdirpath ($ data'new ' ]['document_root ' ] . "/log/goaccess_db " );
2654- $ goaccess_conf$ data'new ' ]['document_root ' ].'/log/goaccess.conf ' ;
2638+ global $ app
26552639
2656- /*
2657- 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/.
2658- By default the originaly with GoAccess shipped goaccess.conf from /etc/ will be used along with the log-format value COMBINED.
2659- */
2640+ $ web_folder$ data'new ' ]['web_folder ' ];
2641+ if ($ data'new ' ]['type ' ] == 'vhost ' ) $ web_folder'web ' ;
26602642
2661- if ( file_exists ( " /usr/local/ispconfig/server/conf-custom/ goaccess.conf.master " )) {
2662- $ app -> system -> copy ( " /usr/local/ispconfig/server/conf-custom/goaccess_index.php.master " , $ goaccess_conf ) ;
2643+ $ goaccess_conf_locs = array ( ' /etc/goaccess.conf ' , ' /etc/goaccess/ goaccess.conf' );
2644+ $ count = 0 ;
26632645
2664- } elseif (!file_exists ($ goaccess_conf
2646+ foreach ($ goaccess_conf_locsas $ goa_loc
2647+ if (is_file ($ goa_locfilesize ($ goa_loc0 )) {
2648+ $ goaccess_conf_main$ goa_loc
2649+ break ;
2650+ } else {
2651+ $ count
2652+ if ($ count2 ) {
2653+ $ applog ("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 );
2654+ }
2655+ }
2656+ }
26652657
2666- /*
2667- By default the goaccess.conf should get copied by the webserver plugin but in case it wasn't, or it got deleted by accident we gonna copy it again to the destination dir.
2668- Also there was no /usr/local/ispconfig/server/conf-custom/goaccess.conf.master, so we gonna use /etc/goaccess.conf as the base conf.
2669- */
2658+ if (!is_dir ($ data'new ' ]['document_root ' ] . "/log/goaccess_db " )) $ appsystem ->mkdirpath ($ data'new ' ]['document_root ' ] . "/log/goaccess_db " );
2659+ $ goaccess_conf$ data'new ' ]['document_root ' ].'/log/goaccess.conf ' ;
26702660
2671- $ appsystem ->copy ($ goaccess_conf_main$ goaccess_conf
2672- $ content$ appsystem ->file_get_contents ($ goaccess_conftrue );
2673- $ contentpreg_replace ('/^(#)?log-format COMBINED/m ' , "log-format COMBINED " , $ content
2674- $ appsystem ->file_put_contents ($ goaccess_conf$ contenttrue );
2675- unset($ content
2661+ /*
2662+ 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/.
2663+ By default the originaly with GoAccess shipped goaccess.conf from /etc/ will be used along with the log-format value COMBINED.
2664+ */
26762665
2677- }
2666+ if (file_exists ("/usr/local/ispconfig/server/conf-custom/goaccess.conf.master " )) {
2667+ $ appsystem ->copy ("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master " , $ goaccess_conf
2668+ } elseif (!file_exists ($ goaccess_conf
2669+ /*
2670+ By default the goaccess.conf should get copied by the webserver plugin but in case it wasn't, or it got deleted by accident we gonna copy it again to the destination dir.
2671+ Also there was no /usr/local/ispconfig/server/conf-custom/goaccess.conf.master, so we gonna use /etc/goaccess.conf as the base conf.
2672+ */
26782673
2679- if ( file_exists ( $ goaccess_conf) {
2680- $ domain $ data [ ' new ' ][ ' domain ' ] ;
2681- $ content$ app -> system -> file_get_contents ( $ goaccess_conf , true );
2682- $ content = preg_replace ( ' /^(#)?html-report-title(.*)/m ' , " html-report-title $ domain " $ content
2683- $ app -> system -> file_put_contents ( $ goaccess_conf , $ content, true );
2684- unset( $ content );
2674+ $ app -> system -> copy ( $ goaccess_conf_main , $ goaccess_conf;
2675+ $ content $ app -> system -> file_get_contents ( $ goaccess_conf , true ) ;
2676+ $ contentpreg_replace ( ' /^(#)?log-format COMBINED/m ' , " log-format COMBINED " , $ content
2677+ $ app -> system -> file_put_contents ( $ goaccess_conf $ content, true );
2678+ unset( $ content
2679+ }
26852680
2686- }
2681+ if (file_exists ($ goaccess_conf
2682+ $ domain$ data'new ' ]['domain ' ];
2683+ $ content$ appsystem ->file_get_contents ($ goaccess_conftrue );
2684+ $ contentpreg_replace ('/^(#)?html-report-title(.*)/m ' , "html-report-title $ domain , $ content
2685+ $ appsystem ->file_put_contents ($ goaccess_conf$ contenttrue );
2686+ unset($ content
2687+ }
26872688
2688- if (is_file ($ goaccess_conffilesize ($ goaccess_conf0 )) {
2689- $ applog ('Created GoAccess config file: ' .$ goaccess_confLOGLEVEL_DEBUG );
2690- }
2689+ if (is_file ($ goaccess_conffilesize ($ goaccess_conf0 )) {
2690+ $ applog ('Created GoAccess config file: ' .$ goaccess_confLOGLEVEL_DEBUG );
2691+ }
26912692
2692- if (is_file ($ data'new ' ]['document_root ' ]."/ " . $ web_folder"/stats/index.html " )) $ appsystem ->unlink ($ data'new ' ]['document_root ' ]."/ " . $ web_folder"/stats/index.html " );
2693- if (file_exists ("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master " )) {
2694- $ appsystem ->copy ("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master " , $ data'new ' ]['document_root ' ]."/ " . $ web_folder"/stats/index.php " );
2695- } else {
2696- $ appsystem ->copy ("/usr/local/ispconfig/server/conf/goaccess_index.php.master " , $ data'new ' ]['document_root ' ]."/ " . $ web_folder"/stats/index.php " );
2693+ if (is_file ($ data'new ' ]['document_root ' ]."/ " . $ web_folder"/stats/index.html " )) $ appsystem ->unlink ($ data'new ' ]['document_root ' ]."/ " . $ web_folder"/stats/index.html " );
2694+ if (file_exists ("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master " )) {
2695+ $ appsystem ->copy ("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master " , $ data'new ' ]['document_root ' ]."/ " . $ web_folder"/stats/index.php " );
2696+ } else {
2697+ $ appsystem ->copy ("/usr/local/ispconfig/server/conf/goaccess_index.php.master " , $ data'new ' ]['document_root ' ]."/ " . $ web_folder"/stats/index.php " );
26972698 }
26982699 }
26992700
2700- //* Delete the GoAccess configuration file
2701- private function goaccess_delete ($ data$ web_config
2702- global $ app
2701+ //* Delete the GoAccess configuration file
2702+ private function goaccess_delete ($ data$ web_config
2703+ global $ app
27032704
2704- $ goaccess_conf$ data'old ' ]['document_root ' ] . "/log/goaccess.conf " ;
2705+ $ goaccess_conf$ data'old ' ]['document_root ' ] . "/log/goaccess.conf " ;
27052706
2706- if ( @is_file ($ goaccess_conf
2707- $ appsystem ->unlink ($ goaccess_conf
2708- $ applog ('Removed GoAccess config file: ' .$ goaccess_confLOGLEVEL_DEBUG );
2709- }
2710- }
2707+ if ( @is_file ($ goaccess_conf
2708+ $ appsystem ->unlink ($ goaccess_conf
2709+ $ applog ('Removed GoAccess config file: ' .$ goaccess_confLOGLEVEL_DEBUG );
2710+ }
2711+ }
27112712
2712- //* Delete the Webalizer configuration file
2713- private function webalizer_delete ($ data$ web_config
2714- global $ app
2713+ //* Delete the Webalizer configuration file
2714+ private function webalizer_delete ($ data$ web_config
2715+ global $ app
27152716
2716- $ webalizer_conf$ data'old ' ]['document_root ' ] . "/log/webalizer.conf " ;
2717+ $ webalizer_conf$ data'old ' ]['document_root ' ] . "/log/webalizer.conf " ;
27172718
2718- if ( @is_file ($ webalizer_conf
2719- $ appsystem ->unlink ($ webalizer_conf
2720- $ applog ('Removed Webalizer config file: ' .$ webalizer_confLOGLEVEL_DEBUG );
2721- }
2722- }
2719+ if ( @is_file ($ webalizer_conf
2720+ $ appsystem ->unlink ($ webalizer_conf
2721+ $ applog ('Removed Webalizer config file: ' .$ webalizer_confLOGLEVEL_DEBUG );
2722+ }
2723+ }
27232724
27242725 //* Update the awstats configuration file
27252726 private function awstats_update ($ data$ web_config
0 commit comments