summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortetragon <tetragon@4979c152-3d1c-0410-bac9-87ea11338e46>2006-11-02 06:52:55 +0000
committertetragon <tetragon@4979c152-3d1c-0410-bac9-87ea11338e46>2006-11-02 06:52:55 +0000
commit438d3506dbfb28429ecd9c8bcca35e6e0cb55b44 (patch)
tree0d3262be1e02882e0b35abb157be4deb947468d3
parentbfd87158e4e0689ffc8759459fd24386b56ab8eb (diff)
Adding more mailer config options
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@462 4979c152-3d1c-0410-bac9-87ea11338e46
-rw-r--r--LedgerSMB/Sysconfig.pm11
-rw-r--r--ledger-smb.conf.default7
2 files changed, 15 insertions, 3 deletions
diff --git a/LedgerSMB/Sysconfig.pm b/LedgerSMB/Sysconfig.pm
index 962c16fc..4e79f72a 100644
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -29,7 +29,11 @@ $templates = "templates";
$memberfile = "users/members";
# location of sendmail
-$sendmail = "| /usr/sbin/sendmail -t";
+$sendmail = "/usr/sbin/sendmail -t";
+
+# SMTP settings
+$smtphost = '';
+$smtptimout = 60;
# set language for login and admin
$language = "";
@@ -71,9 +75,12 @@ $localepath = $config{paths}{localepath} if $config{paths}{localepath};
$spool = $config{paths}{spool} if $config{paths}{spool};
$templates = $config{paths}{tempates} if $config{paths}{tempates};
-$sendmail = $config{programs}{sendmail} if $config{programs}{sendmail};
$gzip = $config{programs}{gzip} if $config{programs}{gzip};
+$sendmail = $config{mail}{sendmail} if $config{mail}{sendmail};
+$smtphost = $config{mail}{smtphost} if $config{mail}{smtphost};
+$smtptimeout = $config{mail}{smtptimeout} if $config{mail}{smtptimeout};
+
$globalDBConnect = $config{globaldb}{DBConnect} if $config{globaldb}{DBConnect};
$globalDBUserName = $config{globaldb}{DBUserName} if $config{globaldb}{DBUserName};
$globalDBPassword = $config{globaldb}{DBPassword} if $config{globaldb}{DBPassword};
diff --git a/ledger-smb.conf.default b/ledger-smb.conf.default
index 8e71cfa5..67c3f560 100644
--- a/ledger-smb.conf.default
+++ b/ledger-smb.conf.default
@@ -30,10 +30,15 @@ memberfile = users/members
localepath = locale/po
[programs]
-sendmail = | /usr/bin/sendmail -t
# program to use for file compression
gzip = gzip -S .gz
+[mail]
+### How to send mail. The sendmail command is used unless smtphost is set.
+sendmail = /usr/bin/sendmail -t
+# smtphost = 127.0.0.1
+# smtptimeout = 60
+
[printers]
# Available printers
Laser = lpr -Plaser