Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
lolo888
ISPConfig 3
Commits
39e5f011
Commit
39e5f011
authored
Mar 13, 2014
by
Till Brehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a issue with apache 2.4 support on Ubuntu 13.10
parent
dc9e64c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+12
-2
install/tpl/apache_ispconfig.conf.master
install/tpl/apache_ispconfig.conf.master
+2
-0
server/conf/apache_ispconfig.conf.master
server/conf/apache_ispconfig.conf.master
+2
-0
No files found.
install/lib/installer_base.lib.php
View file @
39e5f011
...
...
@@ -1243,10 +1243,20 @@ class installer_base {
if
(
is_file
(
'/etc/apache2/apache.conf'
))
{
if
(
hasLine
(
'/etc/apache2/apache.conf'
,
'Include sites-enabled/'
,
1
)
==
false
)
{
if
(
hasLine
(
'/etc/apache2/apache.conf'
,
'IncludeOptional sites-enabled/*.conf'
,
1
)
==
false
)
{
if
(
hasLine
(
'/etc/apache2/apache.conf'
,
'IncludeOptional sites-enabled/*.conf'
,
1
)
==
false
&&
hasLine
(
'/etc/apache2/apache.conf'
,
'IncludeOptional sites-enabled/'
,
1
)
==
false
)
{
replaceLine
(
'/etc/apache2/apache.conf'
,
'Include sites-enabled/'
,
'Include sites-enabled/'
,
1
,
1
);
}
elseif
(
hasLine
(
'/etc/apache2/apache.conf'
,
'IncludeOptional sites-enabled/*.vhost'
,
1
)
==
false
)
{
replaceLine
(
'/etc/apache2/apache.conf'
,
'IncludeOptional sites-enabled/*.vhost'
,
'IncludeOptional sites-enabled/*.vhost'
,
1
,
1
);
replaceLine
(
'/etc/apache2/apache.conf'
,
'IncludeOptional sites-enabled/*.vhost'
,
'IncludeOptional sites-enabled/'
,
1
,
1
);
}
}
}
if
(
is_file
(
'/etc/apache2/apache2.conf'
))
{
if
(
hasLine
(
'/etc/apache2/apache2.conf'
,
'Include sites-enabled/'
,
1
)
==
false
&&
hasLine
(
'/etc/apache2/apache2.conf'
,
'IncludeOptional sites-enabled/'
,
1
)
==
false
)
{
if
(
hasLine
(
'/etc/apache2/apache2.conf'
,
'IncludeOptional sites-enabled/*.conf'
,
1
)
==
true
)
{
replaceLine
(
'/etc/apache2/apache2.conf'
,
'Include sites-enabled/'
,
'Include sites-enabled/'
,
1
,
1
);
}
elseif
(
hasLine
(
'/etc/apache2/apache2.conf'
,
'IncludeOptional sites-enabled/*.conf'
,
1
)
==
true
)
{
replaceLine
(
'/etc/apache2/apache2.conf'
,
'IncludeOptional sites-enabled/*.conf'
,
'IncludeOptional sites-enabled/'
,
1
,
1
);
}
}
}
...
...
install/tpl/apache_ispconfig.conf.master
View file @
39e5f011
...
...
@@ -104,7 +104,9 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
</tmpl_if>
</Directory>
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
Alias /awstats-icon "/usr/share/awstats/icon"
</tmpl_if>
NameVirtualHost *:80
NameVirtualHost *:443
...
...
server/conf/apache_ispconfig.conf.master
View file @
39e5f011
...
...
@@ -104,7 +104,9 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
</tmpl_if>
</Directory>
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
Alias /awstats-icon "/usr/share/awstats/icon"
</tmpl_if>
NameVirtualHost *:80
NameVirtualHost *:443
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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