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
Thom
ISPConfig Autoinstaller
Commits
e3cd8bfb
Commit
e3cd8bfb
authored
Oct 15, 2020
by
Marius Burkard
Browse files
- fixed --no-dns still setting local resolver and installing bind9, fixes #19
parent
46184687
Changes
1
Show whitespace changes
Inline
Side-by-side
lib/os/class.ISPConfigDebianOS.inc.php
View file @
e3cd8bfb
...
...
@@ -119,10 +119,13 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
'zip'
,
'libnet-dns-perl'
,
'libdbd-mysql-perl'
,
'bind9'
,
'dnsutils'
);
if
(
ISPConfig
::
shallInstall
(
'dns'
))
{
$packages
[]
=
'bind9'
;
}
if
(
ISPConfig
::
shallInstall
(
'mail'
))
{
$packages
[]
=
'spamassassin'
;
if
(
ISPConfig
::
wantsAmavis
())
{
...
...
@@ -704,6 +707,8 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
}
$this->restartService('unbound');
*/
if
(
ISPConfig
::
shallInstall
(
'dns'
))
{
if
(
!
is_dir
(
'/etc/resolvconf/resolv.conf.d'
))
{
mkdir
(
'/etc/resolvconf/resolv.conf.d'
,
0755
);
}
...
...
@@ -722,6 +727,7 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
}
elseif
(
strpos
(
$result
,
'127.0.0.1'
)
===
false
)
{
ISPConfigLog
::
warn
(
'Unexpected resolver response: '
.
$result
,
true
);
}
}
if
(
ISPConfig
::
shallInstall
(
'web'
))
{
$this
->
stopService
(
'apache2'
);
...
...
@@ -1191,8 +1197,11 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
'mysql'
,
'clamav-daemon'
,
'postfix'
,
'bind9'
,
);
if
(
ISPConfig
::
shallInstall
(
'dns'
))
{
$check_services
[]
=
'bind9'
;
}
if
(
ISPConfig
::
shallInstall
(
'web'
))
{
$check_services
[]
=
'pureftpd'
;
if
(
ISPConfig
::
$WEBSERVER
===
ISPC_WEBSERVER_APACHE
)
{
...
...
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