Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Webslice
ISPConfig 3
Commits
e6abfe7c
Commit
e6abfe7c
authored
Jan 04, 2014
by
Carsten
Browse files
fallback to awstats.model.conf if awstats.conf does not exist
parent
a1759278
Changes
3
Hide whitespace changes
Inline
Side-by-side
server/lib/classes/cron.d/150-awstats.inc.php
View file @
e6abfe7c
...
...
@@ -100,7 +100,12 @@ class cronjob_awstats extends cronjob {
}
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
View file @
e6abfe7c
...
...
@@ -2626,7 +2626,12 @@ class apache2_plugin {
}
$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
View file @
e6abfe7c
...
...
@@ -2236,7 +2236,12 @@ class nginx_plugin {
}
$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
"
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment