Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jan Kraljič
ISPConfig 3
Commits
e2b4f760
Commit
e2b4f760
authored
Feb 11, 2014
by
Marius Cramer
Browse files
Merge branch 'master' into 'master'
Master
parents
738c3d47
64b2a9cb
Changes
27
Hide whitespace changes
Inline
Side-by-side
install/dist/tpl/gentoo/amavisd-ispconfig.conf.master
View file @
e2b4f760
...
...
@@ -93,6 +93,22 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
# Set the log_level to 5 for debugging
$log_level = 0; # (defaults to 0)
$inet_socket_port = [10024,10026];
$forward_method = 'smtp:[127.0.0.1]:10025';
$notify_method = 'smtp:[127.0.0.1]:10027';
$interface_policy{'10026'} = 'ORIGINATING';
$policy_bank{'ORIGINATING'} = {
originating => 1,
smtpd_discard_ehlo_keywords => ['8BITMIME'],
forward_method => 'smtp:[127.0.0.1]:10027',
};
@mynetworks = qw(0.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12
192.168.0.0/16);
$signed_header_fields{'received'} = 0; # turn off signing of Received
$enable_dkim_verification = 1;
$enable_dkim_signing = 1;
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
#------------ Do not modify anything below this line -------------
1; # insure a defined return
install/tpl/amavisd_user_config.master
View file @
e2b4f760
...
...
@@ -75,6 +75,18 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
# Set the log_level to 5 for debugging
$log_level = 0; # (defaults to 0)
$inet_socket_port = [10024,10026];
$forward_method = 'smtp:[127.0.0.1]:10025';
$notify_method = 'smtp:[127.0.0.1]:10027';
$interface_policy{'10026'} = 'ORIGINATING';
$policy_bank{'ORIGINATING'} = {
originating => 1,
smtpd_discard_ehlo_keywords => ['8BITMIME'],
forward_method => 'smtp:[127.0.0.1]:10027',
};
@mynetworks = qw(0.0.0.0/8 127.0.0.0/8 10.0.0.0/8 172.16.0.0/12
192.168.0.0/16);
# DKIM
$enable_dkim_verification = 1;
...
...
interface/lib/classes/validate_dkim.inc.php
View file @
e2b4f760
...
...
@@ -57,18 +57,6 @@ class validate_dkim {
}
}
/**
* Validator function for DKIM Path
* @return boolean - true when the dkim-path exists and is writeable
*/
function
check_dkim_path
(
$field_name
,
$field_value
,
$validator
)
{
if
(
empty
(
$field_value
))
return
$this
->
get_error
(
$validator
[
'errmsg'
]);
if
(
substr
(
sprintf
(
'%o'
,
fileperms
(
$field_value
)),
-
3
)
<=
600
)
return
$this
->
get_error
(
$validator
[
'errmsg'
]);
}
/**
* Check function for DNS-Template
*/
...
...
interface/web/admin/form/server_config.tform.php
View file @
e2b4f760
...
...
@@ -303,15 +303,19 @@ $form["tabs"]['mail'] = array(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
'default'
=>
'/var/lib/amavis/dkim'
,
'validators'
=>
array
(
0
=>
array
(
'type'
=>
'CUSTOM'
,
'class'
=>
'validate_dkim'
,
'function'
=>
'check_dkim_path'
,
'errmsg'
=>
'dkim_path_error'
),
),
'value'
=>
''
,
'width'
=>
'40'
,
'maxlength'
=>
'255'
),
'relayhost_password'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
'default'
=>
''
,
'value'
=>
''
,
'width'
=>
'40'
,
'maxlength'
=>
'255'
),
'pop3_imap_daemon'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'SELECT'
,
...
...
interface/web/admin/lib/lang/ar_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/bg_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/br_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/cz_server_config.lng
View file @
e2b4f760
...
...
@@ -184,7 +184,6 @@ $wb['monit_user_txt'] = 'Monit User';
$wb
[
'monit_password_txt'
]
=
'Monit Password'
;
$wb
[
'monit_url_error_regex'
]
=
'Invalid Monit URL'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
'monit_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
'munin_url_txt'
]
=
'Munin URL'
;
...
...
interface/web/admin/lib/lang/de_server_config.lng
View file @
e2b4f760
...
...
@@ -20,7 +20,6 @@ $wb['module_txt'] = 'Modul';
$wb
[
'maildir_path_txt'
]
=
'Maildir Pfad'
;
$wb
[
'homedir_path_txt'
]
=
'Homedir Pfad'
;
$wb
[
'dkim_path_txt'
]
=
'DKIM Pfad'
;
$wb
[
'dkim_path_error'
]
=
'DKIM Pfad nicht gefunden oder nicht beschreibbar.'
;
$wb
[
'mailuser_uid_txt'
]
=
'Mailbenutzer UID'
;
$wb
[
'mailuser_gid_txt'
]
=
'Mailbenutzer GID'
;
$wb
[
'mailuser_name_txt'
]
=
'Mailbenutzer Name'
;
...
...
interface/web/admin/lib/lang/en_server_config.lng
View file @
e2b4f760
...
...
@@ -31,7 +31,6 @@ $wb["module_txt"] = 'Module';
$wb
[
"maildir_path_txt"
]
=
'Maildir Path'
;
$wb
[
"homedir_path_txt"
]
=
'Homedir Path'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
"mailuser_uid_txt"
]
=
'Mailuser UID'
;
$wb
[
"mailuser_gid_txt"
]
=
'Mailuser GID'
;
$wb
[
"mailuser_name_txt"
]
=
'Mailuser Name'
;
...
...
interface/web/admin/lib/lang/es_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/fi_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/fr_server_config.lng
View file @
e2b4f760
...
...
@@ -19,7 +19,6 @@ $wb['module_txt'] = 'Module';
$wb
[
'maildir_path_txt'
]
=
'Chemin Maildir'
;
$wb
[
'homedir_path_txt'
]
=
'Chemin Homedir'
;
$wb
[
'dkim_path_txt'
]
=
'Chemin DKIM'
;
$wb
[
'dkim_path_error'
]
=
'Le chemin DKIM n\'est pas trouvé ou ne peut être écrit.'
;
$wb
[
'mailuser_uid_txt'
]
=
'UID de l\'utilisateur mail'
;
$wb
[
'mailuser_gid_txt'
]
=
'GID de l\'utilisateur mail'
;
$wb
[
'mailuser_name_txt'
]
=
'Nom d\'utilisateur mail'
;
...
...
interface/web/admin/lib/lang/hr_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/hu_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/id_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/it_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/ja_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/nl_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
interface/web/admin/lib/lang/pl_server_config.lng
View file @
e2b4f760
...
...
@@ -190,7 +190,6 @@ $wb['munin_password_txt'] = 'Munin Password';
$wb
[
'munin_url_error_regex'
]
=
'Invalid Munin URL'
;
$wb
[
'munin_url_note_txt'
]
=
'Placeholder:'
;
$wb
[
"dkim_path_txt"
]
=
'DKIM Path'
;
$wb
[
"dkim_path_error"
]
=
'DKIM Path not found or not writeable.'
;
$wb
[
'backup_delete_txt'
]
=
'Delete backups on domain/website delete'
;
$wb
[
"v6_prefix_txt"
]
=
'IPv6 Prefix'
;
$wb
[
"vhost_rewrite_v6_txt"
]
=
'Rewrite IPv6 on Mirror'
;
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
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