Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
ea30e1c0
Commit
ea30e1c0
authored
Jan 02, 2016
by
Till Brehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed postconf warnings in installer.
parent
f652c590
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
17 deletions
+17
-17
install/dist/lib/centos_base.lib.php
install/dist/lib/centos_base.lib.php
+3
-3
install/dist/lib/debian60.lib.php
install/dist/lib/debian60.lib.php
+1
-1
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+4
-4
install/dist/lib/gentoo.lib.php
install/dist/lib/gentoo.lib.php
+4
-4
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+5
-5
No files found.
install/dist/lib/centos_base.lib.php
View file @
ea30e1c0
...
...
@@ -71,13 +71,13 @@ class installer_centos extends installer_dist {
// Adding amavis-services to the master.cf file if the service does not already exists
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M amavis.unix"
,
$out
,
$ret
);
exec
(
"postconf -M amavis.unix
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
exec
(
"postconf -M 127.0.0.1:10025.inet"
,
$out
,
$ret
);
exec
(
"postconf -M 127.0.0.1:10025.inet
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis_10025
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
exec
(
"postconf -M 127.0.0.1:10027.inet"
,
$out
,
$ret
);
exec
(
"postconf -M 127.0.0.1:10027.inet
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis_10027
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
}
else
{
//* fallback - postfix < 2.9
...
...
install/dist/lib/debian60.lib.php
View file @
ea30e1c0
...
...
@@ -53,7 +53,7 @@ class installer extends installer_base {
$config_dir
=
$conf
[
'postfix'
][
'config_dir'
];
//* Configure master.cf and add a line for deliver
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
exec
(
"postconf -M dovecot.unix
&> /dev/null
"
,
$out
,
$ret
);
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
...
...
install/dist/lib/fedora.lib.php
View file @
ea30e1c0
...
...
@@ -352,7 +352,7 @@ class installer_dist extends installer_base {
$config_dir
=
$conf
[
'postfix'
][
'config_dir'
];
//* Configure master.cf and add a line for deliver
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
exec
(
"postconf -M dovecot.unix
&> /dev/null
"
,
$out
,
$ret
);
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
...
...
@@ -493,13 +493,13 @@ class installer_dist extends installer_base {
// Adding amavis-services to the master.cf file if the service does not already exists
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M amavis.unix"
,
$out
,
$ret
);
exec
(
"postconf -M amavis.unix
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
exec
(
"postconf -M 127.0.0.1:10025.inet"
,
$out
,
$ret
);
exec
(
"postconf -M 127.0.0.1:10025.inet
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis_10025
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
exec
(
"postconf -M 127.0.0.1:10027.inet"
,
$out
,
$ret
);
exec
(
"postconf -M 127.0.0.1:10027.inet
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis_10027
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
}
else
{
//* fallback - postfix < 2.9
...
...
install/dist/lib/gentoo.lib.php
View file @
ea30e1c0
...
...
@@ -273,7 +273,7 @@ class installer extends installer_base
$config_dir
=
$conf
[
'postfix'
][
'config_dir'
];
//* Configure master.cf and add a line for deliver
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
exec
(
"postconf -M dovecot.unix
&> /dev/null
"
,
$out
,
$ret
);
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
...
...
@@ -395,13 +395,13 @@ class installer extends installer_base
// Adding amavis-services to the master.cf file if the service does not already exists
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M amavis.unix"
,
$out
,
$ret
);
exec
(
"postconf -M amavis.unix
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
exec
(
"postconf -M 127.0.0.1:10025.inet"
,
$out
,
$ret
);
exec
(
"postconf -M 127.0.0.1:10025.inet
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis_10025
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
exec
(
"postconf -M 127.0.0.1:10027.inet"
,
$out
,
$ret
);
exec
(
"postconf -M 127.0.0.1:10027.inet
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis_10027
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
}
else
{
//* fallback - postfix < 2.9
...
...
install/dist/lib/opensuse.lib.php
View file @
ea30e1c0
...
...
@@ -229,7 +229,7 @@ class installer_dist extends installer_base {
$regex
=
"/^maildrop unix.*pipe flags=DRhu user=vmail argv=
\\
/usr
\\
/bin
\\
/maildrop -d "
.
$cf
[
'vmail_username'
]
.
"
\\
$\{extension}
\\
$\{recipient}
\\
$\{user}
\\
$\{nexthop}
\\
$\{sender}/"
;
$configfile
=
$config_dir
.
'/master.cf'
;
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M maildrop.unix"
,
$out
,
$ret
);
exec
(
"postconf -M maildrop.unix
&> /dev/null
"
,
$out
,
$ret
);
$change_maildrop_flags
=
@
(
preg_match
(
$regex
,
$out
[
0
])
&&
$out
[
0
]
!=
''
)
?
false
:
true
;
}
else
{
//* fallback - postfix < 2.9
$change_maildrop_flags
=
@
(
preg_match
(
$regex
,
$configfile
))
?
false
:
true
;
...
...
@@ -367,7 +367,7 @@ class installer_dist extends installer_base {
$config_dir
=
$conf
[
'postfix'
][
'config_dir'
];
//* Configure master.cf and add a line for deliver
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
exec
(
"postconf -M dovecot.unix
&> /dev/null
"
,
$out
,
$ret
);
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
...
...
@@ -503,13 +503,13 @@ class installer_dist extends installer_base {
// Adding amavis-services to the master.cf file if the service does not already exists
if
(
$this
->
postfix_master
())
{
exec
(
"postconf -M amavis.unix"
,
$out
,
$ret
);
exec
(
"postconf -M amavis.unix
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
exec
(
"postconf -M 127.0.0.1:10025.inet"
,
$out
,
$ret
);
exec
(
"postconf -M 127.0.0.1:10025.inet
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis_10025
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
exec
(
"postconf -M 127.0.0.1:10027.inet"
,
$out
,
$ret
);
exec
(
"postconf -M 127.0.0.1:10027.inet
&> /dev/null
"
,
$out
,
$ret
);
$add_amavis_10027
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
unset
(
$out
);
}
else
{
//* fallback - postfix < 2.9
...
...
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