Skip to content
GitLab
Commit 4e5e9b5a authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master' into 'master' 

add dkim to templates

See merge request !210
parents e2963947 b1ae8f95
Hide whitespace changes
Inline Side-by-side
install/dist/lib/fedora.lib.php
View file @ 4e5e9b5a
...@@ -355,7 +355,7 @@ class installer_dist extends installer_base { ...@@ -355,7 +355,7 @@ class installer_dist extends installer_base {
exec ("postconf -M dovecot.unix", $out, $ret); exec ("postconf -M dovecot.unix", $out, $ret);
$add_dovecot_service = @($out[0]=='')?true:false; $add_dovecot_service = @($out[0]=='')?true:false;
} else { //* fallback - postfix < 2.9 } else { //* fallback - postfix < 2.9
$content = rf($config_dir'/master.cf'); $content = rf($config_dir.'/master.cf');
$add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false; $add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false;
} }
if($add_dovecot_service) { if($add_dovecot_service) {
......
install/tpl/fedora_amavisd_conf.master
View file @ 4e5e9b5a
...@@ -48,14 +48,14 @@ $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed ...@@ -48,14 +48,14 @@ $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed
@local_domains_maps = ( [".$mydomain"] ); # list of all local domains @local_domains_maps = ( [".$mydomain"] ); # list of all local domains
@mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10 @mynetworks = qw( 00.0.0.0/8 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ); 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
$unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter $unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter
# option(s) -p overrides $inet_socket_port and $unix_socketname # option(s) -p overrides $inet_socket_port and $unix_socketname
$inet_socket_port = 10024; # listen on this local TCP port(s) # $inet_socket_port = 10024; # listen on this local TCP port(s)
# $inet_socket_port = [10024,10026]; # listen on multiple TCP ports $inet_socket_port = [10024,10026]; # listen on multiple TCP ports
$policy_bank{'MYNETS'} = { # mail originating from @mynetworks $policy_bank{'MYNETS'} = { # mail originating from @mynetworks
originating => 1, # is true in MYNETS by default, but let's make it explicit originating => 1, # is true in MYNETS by default, but let's make it explicit
...@@ -146,8 +146,8 @@ $defang_by_ccat{+CC_BADH.",6"} = 1; # header field syntax error ...@@ -146,8 +146,8 @@ $defang_by_ccat{+CC_BADH.",6"} = 1; # header field syntax error
# $myhostname = 'host.example.com'; # must be a fully-qualified domain name! # $myhostname = 'host.example.com'; # must be a fully-qualified domain name!
# $notify_method = 'smtp:[127.0.0.1]:10025'; $notify_method = 'smtp:[127.0.0.1]:10027';
# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter! $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
# $os_fingerprint_method = 'p0f:127.0.0.1:2345'; # to query p0f-analyzer.pl # $os_fingerprint_method = 'p0f:127.0.0.1:2345'; # to query p0f-analyzer.pl
...@@ -786,4 +786,9 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) ...@@ -786,4 +786,9 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
$log_level = 0; # (defaults to 0) $log_level = 0; # (defaults to 0)
$enable_dkim_verification = 1;
$enable_dkim_signing = 1; # load DKIM signing code
$signed_header_fields{'received'} = 0; # turn off signing of Received
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
1; # insure a defined return 1; # insure a defined return
install/tpl/opensuse_amavisd_conf.master
View file @ 4e5e9b5a
...@@ -48,14 +48,14 @@ $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed ...@@ -48,14 +48,14 @@ $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed
@local_domains_maps = ( [".$mydomain"] ); # list of all local domains @local_domains_maps = ( [".$mydomain"] ); # list of all local domains
@mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10 @mynetworks = qw( 0.0.0.0/8 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ); 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
$unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter $unix_socketname = "$MYHOME/amavisd.sock"; # amavisd-release or amavis-milter
# option(s) -p overrides $inet_socket_port and $unix_socketname # option(s) -p overrides $inet_socket_port and $unix_socketname
$inet_socket_port = 10024; # listen on this local TCP port(s) #$inet_socket_port = 10024; # listen on this local TCP port(s)
# $inet_socket_port = [10024,10026]; # listen on multiple TCP ports $inet_socket_port = [10024,10026]; # listen on multiple TCP ports
$policy_bank{'MYNETS'} = { # mail originating from @mynetworks $policy_bank{'MYNETS'} = { # mail originating from @mynetworks
originating => 1, # is true in MYNETS by default, but let's make it explicit originating => 1, # is true in MYNETS by default, but let's make it explicit
...@@ -145,8 +145,8 @@ $defang_by_ccat{+CC_BADH.",6"} = 1; # header field syntax error ...@@ -145,8 +145,8 @@ $defang_by_ccat{+CC_BADH.",6"} = 1; # header field syntax error
$myhostname = 'linux-jfp8.site'; $myhostname = 'linux-jfp8.site';
# $notify_method = 'smtp:[127.0.0.1]:10025'; $notify_method = 'smtp:[127.0.0.1]:10027';
# $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter! $forward_method = 'smtp:[127.0.0.1]:10025'; # set to undef with milter!
# $final_virus_destiny = D_DISCARD; # $final_virus_destiny = D_DISCARD;
# $final_banned_destiny = D_BOUNCE; # $final_banned_destiny = D_BOUNCE;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment