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
Dirk Dankhoff
ISPConfig 3
Commits
a017a511
Commit
a017a511
authored
Mar 07, 2012
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont set myhostname, mydomain and mynetworks on update in main.cf
parent
ec40f571
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
14 deletions
+42
-14
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+10
-3
install/dist/lib/gentoo.lib.php
install/dist/lib/gentoo.lib.php
+10
-3
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+11
-4
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+11
-4
No files found.
install/dist/lib/fedora.lib.php
View file @
a017a511
...
...
@@ -83,10 +83,8 @@ class installer_dist extends installer_base {
$command
=
'useradd -g '
.
$cf
[
'vmail_groupname'
]
.
' -u '
.
$cf
[
'vmail_userid'
]
.
' '
.
$cf
[
'vmail_username'
]
.
' -d '
.
$cf
[
'vmail_mailbox_base'
]
.
' -m'
;
if
(
!
is_user
(
$cf
[
'vmail_username'
]))
caselog
(
"
$command
&> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
//* These postconf commands will be executed on installation and update
$postconf_commands
=
array
(
'myhostname = '
.
$conf
[
'hostname'
],
'mydestination = '
.
$conf
[
'hostname'
]
.
', localhost, localhost.localdomain'
,
'mynetworks = 127.0.0.0/8 [::1]/128'
,
'virtual_alias_domains ='
,
'virtual_alias_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_forwardings.cf, mysql:'
.
$config_dir
.
'/mysql-virtual_email2email.cf'
,
'virtual_mailbox_domains = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_domains.cf'
,
...
...
@@ -118,6 +116,15 @@ class installer_dist extends installer_base {
'inet_interfaces = all'
);
//* These postconf commands will be executed on installation only
if
(
$this
->
is_update
==
false
)
{
$postconf_commands
=
array_merge
(
$postconf_commands
,
array
(
'myhostname = '
.
$conf
[
'hostname'
],
'mydestination = '
.
$conf
[
'hostname'
]
.
', localhost, localhost.localdomain'
,
'mynetworks = 127.0.0.0/8 [::1]/128'
));
}
//* Create the header and body check files
touch
(
$config_dir
.
'/header_checks'
);
touch
(
$config_dir
.
'/mime_header_checks'
);
...
...
install/dist/lib/gentoo.lib.php
View file @
a017a511
...
...
@@ -80,10 +80,8 @@ class installer extends installer_base
caselog
(
"
$command
&> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
}
//* These postconf commands will be executed on installation and update
$postconf_commands
=
array
(
'myhostname = '
.
$conf
[
'hostname'
],
'mydestination = '
.
$conf
[
'hostname'
]
.
', localhost, localhost.localdomain'
,
'mynetworks = 127.0.0.0/8 [::1]/128'
,
'virtual_alias_domains ='
,
'virtual_alias_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_forwardings.cf, mysql:'
.
$config_dir
.
'/mysql-virtual_email2email.cf'
,
'virtual_mailbox_domains = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_domains.cf'
,
...
...
@@ -113,6 +111,15 @@ class installer extends installer_base
'body_checks = regexp:'
.
$config_dir
.
'/body_checks'
);
//* These postconf commands will be executed on installation only
if
(
$this
->
is_update
==
false
)
{
$postconf_commands
=
array_merge
(
$postconf_commands
,
array
(
'myhostname = '
.
$conf
[
'hostname'
],
'mydestination = '
.
$conf
[
'hostname'
]
.
', localhost, localhost.localdomain'
,
'mynetworks = 127.0.0.0/8 [::1]/128'
));
}
//* Create the header and body check files
touch
(
$config_dir
.
'/header_checks'
);
touch
(
$config_dir
.
'/mime_header_checks'
);
...
...
install/dist/lib/opensuse.lib.php
View file @
a017a511
...
...
@@ -96,11 +96,9 @@ class installer_dist extends installer_base {
}
if
(
$cf
[
'vmail_mailbox_base'
]
!=
''
&&
strlen
(
$cf
[
'vmail_mailbox_base'
])
>=
10
&&
$this
->
is_update
===
false
)
exec
(
'chown -R '
.
$cf
[
'vmail_username'
]
.
':'
.
$cf
[
'vmail_groupname'
]
.
' '
.
$cf
[
'vmail_mailbox_base'
]);
//* These postconf commands will be executed on installation and update
$postconf_commands
=
array
(
'myhostname = '
.
$conf
[
'hostname'
],
'mydestination = '
.
$conf
[
'hostname'
]
.
', localhost, localhost.localdomain'
,
'mynetworks = 127.0.0.0/8 [::1]/128'
,
'virtual_alias_domains ='
,
'virtual_alias_maps = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_forwardings.cf, mysql:'
.
$config_dir
.
'/mysql-virtual_email2email.cf'
,
'virtual_mailbox_domains = proxy:mysql:'
.
$config_dir
.
'/mysql-virtual_domains.cf'
,
...
...
@@ -132,6 +130,15 @@ class installer_dist extends installer_base {
'inet_interfaces = all'
);
//* These postconf commands will be executed on installation only
if
(
$this
->
is_update
==
false
)
{
$postconf_commands
=
array_merge
(
$postconf_commands
,
array
(
'myhostname = '
.
$conf
[
'hostname'
],
'mydestination = '
.
$conf
[
'hostname'
]
.
', localhost, localhost.localdomain'
,
'mynetworks = 127.0.0.0/8 [::1]/128'
));
}
//* Create the header and body check files
touch
(
$config_dir
.
'/header_checks'
);
touch
(
$config_dir
.
'/mime_header_checks'
);
...
...
install/lib/installer_base.lib.php
View file @
a017a511
...
...
@@ -628,11 +628,9 @@ class installer_base {
$command
=
'useradd -g '
.
$cf
[
'vmail_groupname'
]
.
' -u '
.
$cf
[
'vmail_userid'
]
.
' '
.
$cf
[
'vmail_username'
]
.
' -d '
.
$cf
[
'vmail_mailbox_base'
]
.
' -m'
;
if
(
!
is_user
(
$cf
[
'vmail_username'
]))
caselog
(
"
$command
&> /dev/null"
,
__FILE__
,
__LINE__
,
"EXECUTED:
$command
"
,
"Failed to execute the command
$command
"
);
//* These postconf commands will be executed on installation and update
$postconf_commands
=
array
(
'myhostname = '
.
$conf
[
'hostname'
],
'mydestination = '
.
$conf
[
'hostname'
]
.
', localhost, localhost.localdomain'
,
'mynetworks = 127.0.0.0/8 [::1]/128'
,
'alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases'
,
'alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases'
,
'virtual_alias_domains ='
,
...
...
@@ -666,6 +664,15 @@ class installer_base {
'body_checks = regexp:'
.
$config_dir
.
'/body_checks'
,
'owner_request_special = no'
);
//* These postconf commands will be executed on installation only
if
(
$this
->
is_update
==
false
)
{
$postconf_commands
=
array_merge
(
$postconf_commands
,
array
(
'myhostname = '
.
$conf
[
'hostname'
],
'mydestination = '
.
$conf
[
'hostname'
]
.
', localhost, localhost.localdomain'
,
'mynetworks = 127.0.0.0/8 [::1]/128'
));
}
//* Create the header and body check files
touch
(
$config_dir
.
'/header_checks'
);
...
...
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