diff options
| author | Leonardo Arena <rnalrd@gmail.com> | 2009-01-27 10:26:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-01-27 13:11:05 +0000 |
| commit | 11ccfb2a6b37f6f81666d67ef4c98fdd5c3e636f (patch) | |
| tree | b9f45a96669ecafb93409f66198e1238728f20f3 /testing/ssmtp/generate_config.patch | |
| parent | b1c08e60e047806554a40a57669287a7217f3246 (diff) | |
testing/ssmtp: hostname fix
Diffstat (limited to 'testing/ssmtp/generate_config.patch')
| -rw-r--r-- | testing/ssmtp/generate_config.patch | 76 |
1 files changed, 49 insertions, 27 deletions
diff --git a/testing/ssmtp/generate_config.patch b/testing/ssmtp/generate_config.patch index e1543108410..dd4baf9f8a8 100644 --- a/testing/ssmtp/generate_config.patch +++ b/testing/ssmtp/generate_config.patch @@ -1,27 +1,49 @@ -18,34c18 -< echo "Please enter the mail name of your system." -< echo "This is the hostname portion of the address to be shown" -< echo "on outgoing news and mail messages headers." -< echo "The default is $syshostname, your system's host name." -< echo -< echo -n "Mail name [$syshostname]: " -< read mailname -< echo -< -< echo -n "Please enter the SMTP port number [25]: " -< read smtpport -< if test -z "$smtpport" -< then -< mailhub=$mailhub -< else -< mailhub="$mailhub:$smtpport" -< fi ---- -> mailhub="$mailhub:25" -61,66d44 -< -< echo -< echo -< echo "Please check the configuration file $1 for correctness." -< echo -< echo +--- src/ssmtp/generate_config 2004-07-23 05:58:48.000000000 +0000 ++++ generate_config 2009-01-27 10:09:11.000000000 +0000 +@@ -4,7 +4,7 @@ + # Figure out the system's mailname + # + +-syshostname=`hostname --fqdn` ++syshostname="localhost" + if test -f /etc/mailname + then + mailname="`head -1 /etc/mailname`" +@@ -15,23 +15,7 @@ + mailname=$syshostname + fi + +-echo "Please enter the mail name of your system." +-echo "This is the hostname portion of the address to be shown" +-echo "on outgoing news and mail messages headers." +-echo "The default is $syshostname, your system's host name." +-echo +-echo -n "Mail name [$syshostname]: " +-read mailname +-echo +- +-echo -n "Please enter the SMTP port number [25]: " +-read smtpport +-if test -z "$smtpport" +-then +- mailhub=$mailhub +-else +- mailhub="$mailhub:$smtpport" +-fi ++mailhub="$mailhub:$smtpport" + + # + # Generate configuration file +@@ -56,11 +40,5 @@ + # Where will the mail seem to come from? + #rewriteDomain=`echo -n $mailname` + # The full hostname +-hostname=`hostname --fqdn` ++#hostname="localhost" + EOF +- +-echo +-echo +-echo "Please check the configuration file $1 for correctness." +-echo +-echo |