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
ISPConfig
ISPConfig 3
Commits
5d45b769
Commit
5d45b769
authored
Feb 09, 2016
by
Florian Schaal
Browse files
fixed installer -
#3750
parent
eca13b96
Changes
5
Hide whitespace changes
Inline
Side-by-side
install/dist/lib/debian60.lib.php
View file @
5d45b769
...
...
@@ -53,8 +53,9 @@ 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 &> /dev/null"
,
$out
,
$ret
);
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
//* Postfix 2.9
if
(
!
isset
(
$out
[
0
]))
exec
(
"postconf -M dovecot/unix"
,
$out
,
$ret
);
//* Postfix >= 2.11
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
$add_dovecot_service
=
@
(
!
stristr
(
$content
,
"dovecot/deliver"
))
?
true
:
false
;
...
...
install/dist/lib/fedora.lib.php
View file @
5d45b769
...
...
@@ -352,7 +352,8 @@ 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 &> /dev/null"
,
$out
,
$ret
);
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
//* Postfix 2.9
if
(
!
isset
(
$out
[
0
]))
exec
(
"postconf -M dovecot/unix"
,
$out
,
$ret
);
//* Postfix >= 2.11
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
...
...
install/dist/lib/gentoo.lib.php
View file @
5d45b769
...
...
@@ -273,7 +273,8 @@ 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 &> /dev/null"
,
$out
,
$ret
);
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
//* Postfix 2.9
if
(
!
isset
(
$out
[
0
]))
exec
(
"postconf -M dovecot/unix"
,
$out
,
$ret
);
//* Postfix >= 2.11
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
...
...
install/dist/lib/opensuse.lib.php
View file @
5d45b769
...
...
@@ -367,7 +367,8 @@ 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 &> /dev/null"
,
$out
,
$ret
);
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
//* Postfix 2.9
if
(
!
isset
(
$out
[
0
]))
exec
(
"postconf -M dovecot/unix"
,
$out
,
$ret
);
//* Postfix >= 2.11
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
...
...
install/lib/installer_base.lib.php
View file @
5d45b769
...
...
@@ -1145,7 +1145,8 @@ class 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 &> /dev/null"
,
$out
,
$ret
);
exec
(
"postconf -M dovecot.unix"
,
$out
,
$ret
);
//* Postfix 2.9
if
(
!
isset
(
$out
[
0
]))
exec
(
"postconf -M dovecot/unix"
,
$out
,
$ret
);
//* Postfix >= 2.11
$add_dovecot_service
=
@
(
$out
[
0
]
==
''
)
?
true
:
false
;
}
else
{
//* fallback - postfix < 2.9
$content
=
rf
(
$config_dir
.
'/master.cf'
);
...
...
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