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
Jozef Sroka
ISPConfig 3
Commits
bc55aadd
Commit
bc55aadd
authored
Sep 13, 2016
by
A. Täffner
Browse files
added server ini config to $conf and corrected check for apps vhost enabled
parent
c028f1b8
Changes
1
Hide whitespace changes
Inline
Side-by-side
install/update.php
View file @
bc55aadd
...
@@ -287,6 +287,11 @@ checkDbHealth();
...
@@ -287,6 +287,11 @@ checkDbHealth();
*/
*/
updateDbAndIni
();
updateDbAndIni
();
//** read server config from db into $conf['server_config']
$tmp
=
$inst
->
db
->
queryOneRecord
(
"SELECT config FROM ?? WHERE server_id = ?"
,
$conf
[
"mysql"
][
"database"
]
.
'.server'
,
$conf
[
'server_id'
]);
$conf
[
'server_config'
]
=
ini_to_array
(
stripslashes
(
$tmp
[
'config'
]));
unset
(
$tmp
);
/*
/*
* Reconfigure the permisson if needed
* Reconfigure the permisson if needed
* (if this is done at client side, only this client is updated.
* (if this is done at client side, only this client is updated.
...
@@ -428,7 +433,7 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
...
@@ -428,7 +433,7 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
$inst
->
configure_nginx
();
$inst
->
configure_nginx
();
}
}
if
(
$conf
[
'web'
][
'apps_vhost_enabled'
]
==
'y'
)
{
if
(
$conf
[
'
server_config'
][
'
web'
][
'apps_vhost_enabled'
]
==
'y'
)
{
//** Configure apps vhost
//** Configure apps vhost
swriteln
(
'Configuring Apps vhost'
);
swriteln
(
'Configuring Apps vhost'
);
$inst
->
configure_apps_vhost
();
$inst
->
configure_apps_vhost
();
...
...
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