Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
f496e926
Commit
f496e926
authored
Jun 23, 2016
by
Till Brehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for amavisd config permissions on CentOS 7.2
parent
775ed6c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
install/dist/lib/centos_base.lib.php
install/dist/lib/centos_base.lib.php
+7
-1
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+2
-3
No files found.
install/dist/lib/centos_base.lib.php
View file @
f496e926
...
...
@@ -33,7 +33,7 @@ class installer_centos extends installer_dist {
protected
$clamav_socket
=
'/tmp/clamd.socket'
;
public
function
configure_amavis
()
{
global
$conf
;
global
$conf
,
$dist
;
// amavisd user config file
$configfile
=
'fedora_amavisd_conf'
;
...
...
@@ -50,6 +50,12 @@ class installer_centos extends installer_dist {
$content
=
str_replace
(
'/var/spool/amavisd/clamd.sock'
,
$this
->
clamav_socket
,
$content
);
wf
(
$conf
[
"amavis"
][
"config_dir"
]
.
'/amavisd.conf'
,
$content
);
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
0640
);
// for CentOS 7.2 only
if
(
$dist
[
'confid'
]
==
'centos72'
)
{
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
0750
);
chgrp
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
'amavis'
);
}
// Adding the amavisd commands to the postfix configuration
...
...
install/dist/lib/fedora.lib.php
View file @
f496e926
...
...
@@ -480,7 +480,7 @@ class installer_dist extends installer_base {
}
public
function
configure_amavis
()
{
global
$conf
;
global
$conf
,
$dist
;
// amavisd user config file
$configfile
=
'fedora_amavisd_conf'
;
...
...
@@ -497,8 +497,7 @@ class installer_dist extends installer_base {
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
0640
);
// for CentOS 7.2 only
$distname
=
get_distname
();
if
(
$distname
[
'confid'
]
==
'centos72'
)
{
if
(
$dist
[
'confid'
]
==
'centos72'
)
{
chmod
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
0750
);
chgrp
(
$conf
[
'amavis'
][
'config_dir'
]
.
'/amavisd.conf'
,
'amavis'
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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