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
bd1b59a3
Commit
bd1b59a3
authored
Nov 20, 2017
by
Florian Schaal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support conf-custom for tag_as-files for postfix/amavis
parent
4ffd1b13
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
37 deletions
+43
-37
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+11
-11
install/dist/lib/gentoo.lib.php
install/dist/lib/gentoo.lib.php
+11
-11
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+11
-11
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+8
-4
install/tpl/postfix-tag_as_foreign.re.master
install/tpl/postfix-tag_as_foreign.re.master
+1
-0
install/tpl/postfix-tag_as_originating.re.master
install/tpl/postfix-tag_as_originating.re.master
+1
-0
No files found.
install/dist/lib/fedora.lib.php
View file @
bd1b59a3
...
...
@@ -103,17 +103,17 @@ class installer_dist extends installer_base {
$this
->
process_postfix_config
(
'mysql-virtual_uids.cf'
);
//* postfix-dkim
$
full_
file
_
name
=
$config_dir
.
'/
tag_as_originating.re'
;
if
(
is_file
(
$full_
file
_
name
))
{
copy
(
$full_file_name
,
$
config_dir
.
$configfil
e
.
'~'
);
}
wf
(
$full_file_name
,
'/^/ FILTER amavis:[127.0.0.1]:10026'
);
$
full_
file
_
name
=
$config_dir
.
'/
tag_as_foreign.re'
;
if
(
is_file
(
$full_
file
_
name
))
{
copy
(
$full_file_name
,
$
config_dir
.
$configfil
e
.
'~'
);
}
wf
(
$full_file_name
,
'/^/ FILTER amavis:[127.0.0.1]:10024'
);
$filename
=
'
tag_as_originating.re'
;
$full_file_name
=
$config_dir
.
'/'
.
$
filename
;
if
(
is_file
(
$full_file_name
))
copy
(
$full_file_name
,
$
full_file_nam
e
.
'~'
);
$content
=
rfsel
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/postfix-'
.
$filename
.
'.master'
,
'tpl/postfix-'
.
$filename
.
'.master'
);
wf
(
$full_file_name
,
$content
);
$filename
=
'
tag_as_foreign.re'
;
$full_file_name
=
$config_dir
.
'/'
.
$
filename
;
if
(
is_file
(
$full_file_name
))
copy
(
$full_file_name
,
$
full_file_nam
e
.
'~'
);
$content
=
rfsel
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/postfix-'
.
$filename
.
'.master'
,
'tpl/postfix-'
.
$filename
.
'.master'
);
wf
(
$full_file_name
,
$content
);
//* Changing mode and group of the new created config files.
caselog
(
'chmod o= '
.
$config_dir
.
'/mysql-virtual_*.cf* &> /dev/null'
,
...
...
install/dist/lib/gentoo.lib.php
View file @
bd1b59a3
...
...
@@ -212,17 +212,17 @@ class installer extends installer_base
}
//* postfix-dkim
$
full_
file
_
name
=
$config_dir
.
'/
tag_as_originating.re'
;
if
(
is_file
(
$full_
file
_
name
))
{
copy
(
$full_file_name
,
$
config_dir
.
$configfil
e
.
'~'
);
}
$this
->
write_config_file
(
$full_file_name
,
'/^/ FILTER amavis:[127.0.0.1]:10026'
);
$
full_
file
_
name
=
$config_dir
.
'/
tag_as_foreign.re'
;
if
(
is_file
(
$full_
file
_
name
))
{
copy
(
$full_file_name
,
$
config_dir
.
$configfil
e
.
'~'
);
}
$this
->
write_config_file
(
$full_file_name
,
'/^/ FILTER amavis:[127.0.0.1]:10024'
);
$filename
=
'
tag_as_originating.re'
;
$full_file_name
=
$config_dir
.
'/'
.
$
filename
;
if
(
is_file
(
$full_file_name
))
copy
(
$full_file_name
,
$
full_file_nam
e
.
'~'
);
$content
=
rfsel
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/postfix-'
.
$filename
.
'.master'
,
'tpl/postfix-'
.
$filename
.
'.master'
);
wf
(
$full_file_name
,
$content
);
$filename
=
'
tag_as_foreign.re'
;
$full_file_name
=
$config_dir
.
'/'
.
$
filename
;
if
(
is_file
(
$full_file_name
))
copy
(
$full_file_name
,
$
full_file_nam
e
.
'~'
);
$content
=
rfsel
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/postfix-'
.
$filename
.
'.master'
,
'tpl/postfix-'
.
$filename
.
'.master'
);
wf
(
$full_file_name
,
$content
);
//* Chmod and chown the .mailfilter file
$command
=
'chown -R '
.
$cf
[
'vmail_username'
]
.
':'
.
$cf
[
'vmail_groupname'
]
.
' '
.
$cf
[
'vmail_mailbox_base'
]
.
'/.mailfilter'
;
...
...
install/dist/lib/opensuse.lib.php
View file @
bd1b59a3
...
...
@@ -100,17 +100,17 @@ class installer_dist extends installer_base {
$this
->
process_postfix_config
(
'mysql-virtual_uids.cf'
);
//* postfix-dkim
$
full_
file
_
name
=
$config_dir
.
'/
tag_as_originating.re'
;
if
(
is_file
(
$full_
file
_
name
))
{
copy
(
$full_file_name
,
$
config_dir
.
$configfil
e
.
'~'
);
}
wf
(
$full_file_name
,
'/^/ FILTER amavis:[127.0.0.1]:10026'
);
$
full_
file
_
name
=
$config_dir
.
'/
tag_as_foreign.re'
;
if
(
is_file
(
$full_
file
_
name
))
{
copy
(
$full_file_name
,
$
config_dir
.
$configfil
e
.
'~'
);
}
wf
(
$full_file_name
,
'/^/ FILTER amavis:[127.0.0.1]:10024'
);
$filename
=
'
tag_as_originating.re'
;
$full_file_name
=
$config_dir
.
'/'
.
$
filename
;
if
(
is_file
(
$full_file_name
))
copy
(
$full_file_name
,
$
full_file_nam
e
.
'~'
);
$content
=
rfsel
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/postfix-'
.
$filename
.
'.master'
,
'tpl/postfix-'
.
$filename
.
'.master'
);
wf
(
$full_file_name
,
$content
);
$filename
=
'
tag_as_foreign.re'
;
$full_file_name
=
$config_dir
.
'/'
.
$
filename
;
if
(
is_file
(
$full_file_name
))
copy
(
$full_file_name
,
$
full_file_nam
e
.
'~'
);
$content
=
rfsel
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/postfix-'
.
$filename
.
'.master'
,
'tpl/postfix-'
.
$filename
.
'.master'
);
wf
(
$full_file_name
,
$content
);
//* Changing mode and group of the new created config files.
caselog
(
'chmod o= '
.
$config_dir
.
'/mysql-virtual_*.cf* &> /dev/null'
,
...
...
install/lib/installer_base.lib.php
View file @
bd1b59a3
...
...
@@ -901,13 +901,17 @@ class installer_base {
$this
->
process_postfix_config
(
'mysql-virtual_uids.cf'
);
//* postfix-dkim
$full_file_name
=
$config_dir
.
'/tag_as_originating.re'
;
$filename
=
'tag_as_originating.re'
;
$full_file_name
=
$config_dir
.
'/'
.
$filename
;
if
(
is_file
(
$full_file_name
))
copy
(
$full_file_name
,
$full_file_name
.
'~'
);
wf
(
$full_file_name
,
'/^/ FILTER amavis:[127.0.0.1]:10026'
);
$content
=
rfsel
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/postfix-'
.
$filename
.
'.master'
,
'tpl/postfix-'
.
$filename
.
'.master'
);
wf
(
$full_file_name
,
$content
);
$full_file_name
=
$config_dir
.
'/tag_as_foreign.re'
;
$filename
=
'tag_as_foreign.re'
;
$full_file_name
=
$config_dir
.
'/'
.
$filename
;
if
(
is_file
(
$full_file_name
))
copy
(
$full_file_name
,
$full_file_name
.
'~'
);
wf
(
$full_file_name
,
'/^/ FILTER amavis:[127.0.0.1]:10024'
);
$content
=
rfsel
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/postfix-'
.
$filename
.
'.master'
,
'tpl/postfix-'
.
$filename
.
'.master'
);
wf
(
$full_file_name
,
$content
);
//* Changing mode and group of the new created config files.
caselog
(
'chmod u=rw,g=r,o= '
.
$config_dir
.
'/mysql-virtual_*.cf* &> /dev/null'
,
...
...
install/tpl/postfix-tag_as_foreign.re.master
0 → 100644
View file @
bd1b59a3
/^/ FILTER amavis:[127.0.0.1]:10024
install/tpl/postfix-tag_as_originating.re.master
0 → 100644
View file @
bd1b59a3
/^/ FILTER amavis:[127.0.0.1]:10026
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