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
Hj Ahmad Rasyid Hj Ismail
ISPConfig Autoinstaller
Commits
aee2f823
Commit
aee2f823
authored
Oct 15, 2020
by
Marius Burkard
Browse files
- fixes for ubuntu
parent
0ddf927d
Changes
2
Show whitespace changes
Inline
Side-by-side
lib/os/class.ISPConfigUbuntu2004OS.inc_1.php
View file @
aee2f823
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
*
*
* @author croydon
* @author croydon
*/
*/
class
ISPConfigUbuntuOS
extends
ISPConfig
Debian
OS
{
class
ISPConfigUbuntu
2004
OS
extends
ISPConfig
Ubuntu
OS
{
protected
function
configureApt
()
{
protected
function
configureApt
()
{
// enable contrib and non-free
// enable contrib and non-free
ISPConfigLog
::
info
(
'Configuring apt repositories.'
,
true
);
ISPConfigLog
::
info
(
'Configuring apt repositories.'
,
true
);
...
@@ -35,18 +35,6 @@ deb http://security.ubuntu.com/ubuntu focal-security multiverse
...
@@ -35,18 +35,6 @@ deb http://security.ubuntu.com/ubuntu focal-security multiverse
}
}
}
}
protected
function
afterPackageInstall
(
$section
=
''
)
{
if
(
$section
===
'mail'
)
{
$cmd
=
'freshclam'
;
$result
=
$this
->
exec
(
$cmd
,
array
(
62
));
if
(
$result
===
false
)
{
throw
new
ISPConfigOSException
(
'Command '
.
$cmd
.
' failed.'
);
}
$this
->
startService
(
'clamav-daemon'
);
}
}
protected
function
addSuryRepo
()
{
protected
function
addSuryRepo
()
{
ISPConfigLog
::
info
(
'Activating sury php repository.'
,
true
);
ISPConfigLog
::
info
(
'Activating sury php repository.'
,
true
);
...
...
lib/os/class.ISPConfigUbuntuOS.inc.php
View file @
aee2f823
...
@@ -40,7 +40,7 @@ deb http://security.ubuntu.com/ubuntu bionic-security multiverse
...
@@ -40,7 +40,7 @@ deb http://security.ubuntu.com/ubuntu bionic-security multiverse
$cmd
=
'freshclam'
;
$cmd
=
'freshclam'
;
$result
=
$this
->
exec
(
$cmd
,
array
(
62
));
$result
=
$this
->
exec
(
$cmd
,
array
(
62
));
if
(
$result
===
false
)
{
if
(
$result
===
false
)
{
throw
new
ISPConfigOSException
(
'Command '
.
$cmd
.
' failed.'
);
//
throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
}
}
$this
->
startService
(
'clamav-daemon'
);
$this
->
startService
(
'clamav-daemon'
);
...
...
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