Mostly named changes to be more consistent with the project but also removed ledger-smb.conf.default as it appears replaced by LedgerSMB::Sysconfig (if I am wrong I apologize).

Also editing Sysconfig.pm and install.sh (does this need to be removed?) to address new conf files.



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

5 files changed, 2 insertions, 120 deletions

diff --git a/LedgerSMB/Sysconfig.pm b/LedgerSMB/Sysconfig.pm
index 14bdfa2f..a26b3cbc 100644
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -67,7 +67,7 @@ $localepath = 'locale/po';
 	     );
 
 my %config;
-read_config('ledger-smb.conf' => %config) or die;
+read_config('ledgersmb.conf' => %config) or die;
 
 $logging = $config{''}{logging} if $config{''}{logging};
 $check_max_invoices = $config{''}{check_max_invoices} if
diff --git a/install.sh b/install.sh
index 645bde4b..b4d8599c 100644
--- a/install.sh
+++ b/install.sh
@@ -11,6 +11,6 @@ chown $username spool templates css
 
 echo "Where do we copy the ledger-smb-httpd.conf file to?"
 read location
-cp ledger-smb-httpd.conf $location
+cp ledgersmb-httpd.conf $location
 
 echo "Please restart your web server for the changes to take effect."
diff --git a/ledger-smb-httpd.conf b/ledger-smb-httpd.conf
deleted file mode 100644
index 3e74f1ea..00000000
--- a/ledger-smb-httpd.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Alias /ledger-smb WORKING_DIR/ledger-smb/
-
-<Directory WORKING_DIR/ledger-smb>
-  AllowOverride All
-  AddHandler cgi-script .pl
-  Options ExecCGI Includes FollowSymlinks
-  Order Allow,Deny
-  Allow from All
-  <Files ~ "\.conf$">
-    Order Deny,Allow
-    Deny from All
-  </Files>
-</Directory>
-
-<Directory WORKING_DIR/ledger-smb/users>
-  Order Deny,Allow
-  Deny from All
-</Directory>
-  
-<Directory WORKING_DIR/ledger-smb/bin>
-  Order Deny,Allow
-  Deny from All
-</Directory>
-  
-<Directory WORKING_DIR/ledger-smb/utils>
-  Order Deny,Allow
-  Deny from All
-</Directory>
-  
-<Directory WORKING_DIR/ledger-smb/spool>
-  Order Deny,Allow
-  Deny from All
-</Directory>
-
-<Directory WORKING_DIR/ledger-smb/templates>
-  Order Deny,Allow
-  Deny from All
-</Directory>
-  
-<Directory WORKING_DIR/ledger-smb/LedgerSMB>
-  Order Deny,Allow
-  Deny from All
-</Directory>
diff --git a/ledger-smb.conf b/ledger-smb.conf
deleted file mode 100644
index 6427cce6..00000000
--- a/ledger-smb.conf
+++ /dev/null
@@ -1,20 +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
-DBname: lsmb13
-DBhost: localhost
-DBport: 5432
-DBUserName: postgres
-DBPassword:
diff --git a/ledger-smb.conf.default b/ledger-smb.conf.default
deleted file mode 100644
index a9fc86a8..00000000
--- a/ledger-smb.conf.default
+++ /dev/null
@@ -1,54 +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
-# images base directory
-images  = images
-# 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