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
47840eba
Commit
47840eba
authored
May 11, 2017
by
Till Brehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed #4650 dovecot postmaster_address
parent
f94f4f51
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
0 deletions
+6
-0
install/dist/lib/debian60.lib.php
install/dist/lib/debian60.lib.php
+1
-0
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+2
-0
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+2
-0
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+1
-0
No files found.
install/dist/lib/debian60.lib.php
View file @
47840eba
...
...
@@ -105,6 +105,7 @@ class installer extends installer_base {
copy
(
'tpl/debian6_dovecot2.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = postmaster@example.com'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = webmaster@localhost'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
if
(
version_compare
(
$dovecot_version
,
2.1
)
<
0
)
{
removeLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_protocols ='
);
}
...
...
install/dist/lib/fedora.lib.php
View file @
47840eba
...
...
@@ -443,6 +443,8 @@ class installer_dist extends installer_base {
if
(
version_compare
(
$dovecot_version
,
2.1
)
<
0
)
{
removeLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_protocols ='
);
}
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = postmaster@example.com'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = webmaster@localhost'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
}
else
{
if
(
is_file
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/fedora_dovecot.conf.master'
))
{
copy
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/fedora_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
...
...
install/dist/lib/opensuse.lib.php
View file @
47840eba
...
...
@@ -450,6 +450,8 @@ class installer_dist extends installer_base {
}
else
{
copy
(
'tpl/opensuse_dovecot2.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = postmaster@example.com'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = webmaster@localhost'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
}
else
{
if
(
is_file
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/opensuse_dovecot.conf.master'
))
{
copy
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/opensuse_dovecot.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
...
...
install/lib/installer_base.lib.php
View file @
47840eba
...
...
@@ -1266,6 +1266,7 @@ class installer_base {
copy
(
'tpl/debian_dovecot2.conf.master'
,
$config_dir
.
'/'
.
$configfile
);
}
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = postmaster@example.com'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = webmaster@localhost'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
if
(
version_compare
(
$dovecot_version
,
2.1
,
'<'
))
{
removeLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_protocols ='
);
}
...
...
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