fallback to awstats.model.conf if awstats.conf does not exist

Author: Carsten Schoene

server/lib/classes/cron.d/150-awstats.inc.php

@@ -100,7 +100,12 @@ public function onRunJob() {
 			}
 
 			if(!is_file($awstats_website_conf_file)) {
-				$awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf"
+				if (is_file($awstats_conf_dir."/awstats.conf")) {
+                                	$include_file = $awstats_conf_dir."/awstats.conf";
+				} elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
+					$include_file = $awstats_conf_dir."/awstats.model.conf";
+				}
+				$awstats_conf_file_content = 'Include "'.$include_file.'"
         LogFile="/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log"
         SiteDomain="'.$domain.'"
         HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"';

server/plugins-available/apache2_plugin.inc.php

@@ -2626,7 +2626,12 @@ private function awstats_update ($data, $web_config) {
 			}
 
 			$content = '';
-			$content .= "Include \"".$awstats_conf_dir."/awstats.conf\"\n";
+			if (is_file($awstats_conf_dir."/awstats.conf")) {
+				$include_file = $awstats_conf_dir."/awstats.conf";
+			} elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
+				$include_file = $awstats_conf_dir."/awstats.model.conf";
+			}
+			$content .= "Include \"".$include_file\"\n";
 			$content .= "LogFile=\"/var/log/ispconfig/httpd/".$data['new']['domain']."/access.log\"\n";
 			$content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
 			$content .= "HostAliases=\"www.".$data['new']['domain']."  localhost 127.0.0.1\"\n";

server/plugins-available/nginx_plugin.inc.php

@@ -2236,7 +2236,12 @@ private function awstats_update ($data, $web_config) {
 			}
 
 			$content = '';
-			$content .= "Include \"".$awstats_conf_dir."/awstats.conf\"\n";
+			if (is_file($awstats_conf_dir."/awstats.conf")) {
+				$include_file = $awstats_conf_dir."/awstats.conf";
+			} elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
+				$include_file = $awstats_conf_dir."/awstats.model.conf";
+			}
+			$content .= "Include \"".$include_file\"\n";
 			$content .= "LogFile=\"/var/log/ispconfig/httpd/".$data['new']['domain']."/access.log\"\n";
 			$content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
 			$content .= "HostAliases=\"www.".$data['new']['domain']."  localhost 127.0.0.1\"\n";