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
ead7ad94
Commit
ead7ad94
authored
Apr 25, 2016
by
Florian Schaal
Browse files
updated installer and updater - detect which and haveged (Fixes: #3843 and #3840)
parent
d0e9f82a
Changes
2
Hide whitespace changes
Inline
Side-by-side
install/install.php
View file @
ead7ad94
...
@@ -140,6 +140,8 @@ include_once 'dist/conf/'.$dist['id'].'.conf.php';
...
@@ -140,6 +140,8 @@ include_once 'dist/conf/'.$dist['id'].'.conf.php';
//****************************************************************************************************
//****************************************************************************************************
$inst
=
new
installer
();
$inst
=
new
installer
();
if
(
!
$inst
->
get_php_version
())
die
(
'ISPConfig requieres PHP '
.
$inst
->
min_php
.
"
\n
"
);
if
(
!
$inst
->
get_php_version
())
die
(
'ISPConfig requieres PHP '
.
$inst
->
min_php
.
"
\n
"
);
$retval
=
shell_exec
(
"which which"
);
if
(
empty
(
$retval
))
die
(
"ISPConfig requieres which
\n
"
);
swriteln
(
$inst
->
lng
(
' Following will be a few questions for primary configuration so be careful.'
));
swriteln
(
$inst
->
lng
(
' Following will be a few questions for primary configuration so be careful.'
));
swriteln
(
$inst
->
lng
(
' Default values are in [brackets] and can be accepted with <ENTER>.'
));
swriteln
(
$inst
->
lng
(
' Default values are in [brackets] and can be accepted with <ENTER>.'
));
...
@@ -347,6 +349,9 @@ if($install_mode == 'standard') {
...
@@ -347,6 +349,9 @@ if($install_mode == 'standard') {
swriteln
(
'Configuring BIND'
);
swriteln
(
'Configuring BIND'
);
$inst
->
configure_bind
();
$inst
->
configure_bind
();
$conf
[
'services'
][
'dns'
]
=
true
;
$conf
[
'services'
][
'dns'
]
=
true
;
if
(
!
$inst
->
find_installed_apps
(
'haveged'
))
{
swriteln
(
"[INFO] haveged not detected - DNSSEC can fail"
);
}
}
}
//* Configure MyDNS
//* Configure MyDNS
if
(
$conf
[
'mydns'
][
'installed'
])
{
if
(
$conf
[
'mydns'
][
'installed'
])
{
...
@@ -727,6 +732,9 @@ if($install_mode == 'standard') {
...
@@ -727,6 +732,9 @@ if($install_mode == 'standard') {
swriteln
(
'Configuring BIND'
);
swriteln
(
'Configuring BIND'
);
$inst
->
configure_bind
();
$inst
->
configure_bind
();
$conf
[
'services'
][
'dns'
]
=
true
;
$conf
[
'services'
][
'dns'
]
=
true
;
if
(
!
$inst
->
find_installed_apps
(
'haveged'
))
{
swriteln
(
"[INFO] haveged not detected - DNSSEC can fail"
);
}
}
}
//* Configure MyDNS
//* Configure MyDNS
if
(
$conf
[
'mydns'
][
'installed'
])
{
if
(
$conf
[
'mydns'
][
'installed'
])
{
...
...
install/update.php
View file @
ead7ad94
...
@@ -378,6 +378,9 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
...
@@ -378,6 +378,9 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
}
elseif
(
$conf
[
'bind'
][
'installed'
]
==
true
)
{
}
elseif
(
$conf
[
'bind'
][
'installed'
]
==
true
)
{
swriteln
(
'Configuring BIND'
);
swriteln
(
'Configuring BIND'
);
$inst
->
configure_bind
();
$inst
->
configure_bind
();
if
(
!
$inst
->
find_installed_apps
(
'haveged'
))
{
swriteln
(
"[INFO] haveged not detected - DNSSEC can fail"
);
}
}
else
{
}
else
{
swriteln
(
'Configuring MyDNS'
);
swriteln
(
'Configuring MyDNS'
);
$inst
->
configure_mydns
();
$inst
->
configure_mydns
();
...
...
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