summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErwan Velu <erwan@mandriva.org>2003-07-17 13:00:43 +0000
committerErwan Velu <erwan@mandriva.org>2003-07-17 13:00:43 +0000
commitadbf6850ee6baa497a70e6dbfd87b6c29e9601e5 (patch)
tree9a9a4796483fb4ffa11c4bad97c914656ae4b3ff
parent39e07227f94ddca339adc84c266d906ff499540b (diff)
downloaddrakx-adbf6850ee6baa497a70e6dbfd87b6c29e9601e5.tar
drakx-adbf6850ee6baa497a70e6dbfd87b6c29e9601e5.tar.gz
drakx-adbf6850ee6baa497a70e6dbfd87b6c29e9601e5.tar.bz2
drakx-adbf6850ee6baa497a70e6dbfd87b6c29e9601e5.tar.xz
drakx-adbf6850ee6baa497a70e6dbfd87b6c29e9601e5.zip
Postfix domain will equal domainname
-rw-r--r--perl-install/drakcluster/server_conf.pm2
-rw-r--r--perl-install/drakcluster/server_conf_drakx.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/drakcluster/server_conf.pm b/perl-install/drakcluster/server_conf.pm
index bf5c4cd91..46a7f9394 100644
--- a/perl-install/drakcluster/server_conf.pm
+++ b/perl-install/drakcluster/server_conf.pm
@@ -47,7 +47,7 @@ sub fields {
[ DNSKEY => 'DNS server dnskey', check => \&check_non_empty ],
[ ADDSEARCH => 'ADDSEARCH ' . N("Domain name of your external network") ],
[ USERADMIN => 'PBS administrator user name', check => \&check_non_empty ],
- [ ORIGIN => 'ORIGIN ' . N("Domain that locally posted mails appears to come from") ],
+ [ ORIGIN => 'ORIGIN ' . N("Domain that locally posted mails appears to come from"), check => sub { check_default(@_, $default_conf->{DOMAINNAME}, $current_conf->{DOMAINNAME}) } ],
);
if (@$network_interfaces <= 2) {
diff --git a/perl-install/drakcluster/server_conf_drakx.pm b/perl-install/drakcluster/server_conf_drakx.pm
index 46a131ea9..07e27b95b 100644
--- a/perl-install/drakcluster/server_conf_drakx.pm
+++ b/perl-install/drakcluster/server_conf_drakx.pm
@@ -23,6 +23,7 @@ sub default_conf {
DOMAINNAME => $o->{netc}{DOMAINNAME},
NTPSERVER => $o->{intf}{eth0}{IPADDR},
IPOFFORWARDER => network::dnsServers($o->{netc}),
+ ORIGIN => $o->{netc}{DOMAINNAME},
};
}