maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

add apache-2.4 to the installer so apache-2.4 users get the 2.4 mods activated right away, NOTE: we cannot find out whether you're on 2.2 or 2.4 - so you should now what you got and select the correct one, fixes #1566

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-11-12 08:27:07 +01:00
parent 0651dc28c8
commit d21391e8ba
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
install/lib/class.FroxlorInstall.php
View File

@@ -454,7 +454,9 @@ class FroxlorInstall {
$this->_updateSetting($upd_stmt, $this->_data['httpgroup'], 'system', 'httpgroup');
// necessary changes for webservers != apache2
if ($this->_data['webserver'] == "lighttpd") {
if ($this->_data['webserver'] == "apache24") {
$this->_updateSetting($upd_stmt, '1', 'system', 'apache24');
} elseif ($this->_data['webserver'] == "lighttpd") {
$this->_updateSetting($upd_stmt, '/etc/lighttpd/conf-enabled/', 'system', 'apacheconf_vhost');
$this->_updateSetting($upd_stmt, '/etc/lighttpd/froxlor-diroptions/', 'system', 'apacheconf_diroptions');
$this->_updateSetting($upd_stmt, '/etc/lighttpd/froxlor-htpasswd/', 'system', 'apacheconf_htpasswddir');
@@ -766,6 +768,7 @@ class FroxlorInstall {
}
// apache
$formdata .= $this->_getSectionItemCheckbox('apache2', ($this->_data['webserver'] == 'apache2'), $websrvstyle);
$formdata .= $this->_getSectionItemCheckbox('apache24', ($this->_data['webserver'] == 'apache24'), $websrvstyle);
// lighttpd
$formdata .= $this->_getSectionItemCheckbox('lighttpd', ($this->_data['webserver'] == 'lighttpd'), $websrvstyle);
// nginx