Updating the sample config to reflect the new global DB config

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@956 4979c152-3d1c-0410-bac9-87ea11338e46

3 files changed, 3 insertions, 71 deletions

diff --git a/ledger-smb.conf b/ledger-smb.conf
deleted file mode 100644
index 29024dc5..00000000
--- a/ledger-smb.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[environment]
-# if the server can't find gzip, latex, dvips or pdflatex, append the path
-PATH: /usr/local/bin
-PATH: /usr/local/pgsql/bin
-
-# on mac os X using Fink's Perl libs, add the path
-#PERL5LIB: /sw/lib/perl5
-
-#################################
-# Global database parameters
-#################################
-# These parameters *must* be set correctly for LedgerSMB >= 1.2 to work
-#
-[globaldb]
-##uncomment below and set to correct values
-DBConnect: dbi:Pg:dbname=lsmb13;host=localhost;port=5432
-DBUserName: postgres
-DBPassword: test 
diff --git a/ledger-smb.conf.default b/ledger-smb.conf.default
deleted file mode 100644
index 0b906640..00000000
--- a/ledger-smb.conf.default
+++ /dev/null
@@ -1,52 +0,0 @@
-session  : DB
-logging  : 0
-
-# Set language for login and admin pages
-language : 
-
-# If you have LaTeX installed, set to 1
-latex : 1
-
-# Maximum number of invoices that can be printed on a cheque
-check_max_invoices : 5
-
-[environment]
-# If the server can't find applications, append to the path
-PATH: /usr/local/pgsql/bin
-PATH: /usr/local/bin
-
-# If on Mac OS X using Fink's Perl libs, append to the path
-#PERL5LIB = /sw/lib/perl5
-
-[paths]
-# spool directory for batch printing
-spool      = spool
-# path to user configuration files
-userspath  = users
-# templates base directory
-templates  = templates
-# member file
-memberfile = users/members
-localepath = locale/po
-
-[programs]
-# 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
-Epson      = lpr -PEpson
-
-[globaldb]
-# These paramaters *must* be set correctly
-# for LedgerSMB >= 1.2 to work
-DBConnect  = dbi:Pg:dbname=ledgersmb;host=localhost;port=5432
-DBUserName   = ledgersmb
-DBPassword   = set me to correct password
diff --git a/ledgersmb.conf.default b/ledgersmb.conf.default
index 0b906640..72f28cbb 100644
--- a/ledgersmb.conf.default
+++ b/ledgersmb.conf.default
@@ -47,6 +47,8 @@ Epson      = lpr -PEpson
 [globaldb]
 # These paramaters *must* be set correctly
 # for LedgerSMB >= 1.2 to work
-DBConnect  = dbi:Pg:dbname=ledgersmb;host=localhost;port=5432
+DBname       = ledgersmb
+DBhost       = localhost
+DBport       = 5432
 DBUserName   = ledgersmb
 DBPassword   = set me to correct password