X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=6de31159613bc2ca5adf2813f7496bc37520ec5f;hb=0d6147067e8d5317d01692f8588b3a0167c664c8;hp=25c6743012cc4f4d20170420b33692a56c79440f;hpb=e1ef1693e6942bbf82ee088f782d871a3b5eefee;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 25c674301..6de311596 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -221,8 +221,8 @@ httemplate/docs/config.html
{
'key' => 'apacheroot',
- 'section' => 'apache',
- 'description' => 'The directory containing Apache virtual hosts',
+ 'section' => 'deprecated',
+ 'description' => 'DEPRECATED, add a www_shellcommands export instead. The directory containing Apache virtual hosts',
'type' => 'text',
},
@@ -235,8 +235,8 @@ httemplate/docs/config.html
{
'key' => 'apachemachine',
- 'section' => 'apache',
- 'description' => 'A machine with the apacheroot directory and user home directories. The existance of this file enables setup of virtual host directories, and, in conjunction with the `home\' configuration file, symlinks into user home directories.',
+ 'section' => 'deprecated',
+ 'description' => 'DEPRECATED, add a www_shellcommands export instead. A machine with the apacheroot directory and user home directories. The existance of this file enables setup of virtual host directories, and, in conjunction with the `home\' configuration file, symlinks into user home directories.',
'type' => 'text',
},
@@ -269,6 +269,13 @@ httemplate/docs/config.html
},
{
+ 'key' => 'business-onlinepayment-ach',
+ 'section' => 'billing',
+ 'description' => 'Alternate Business::OnlinePayment support for ACH transactions (defaults to regular business-onlinepayment). At least three lines: processor, login, and password. An optional fourth line specifies the action or actions (multiple actions are separated with `,\': for example: `Authorization Only, Post Authorization\'). Optional additional lines are passed to Business::OnlinePayment as %processor_options.',
+ 'type' => 'textarea',
+ },
+
+ {
'key' => 'business-onlinepayment-description',
'section' => 'billing',
'description' => 'String passed as the description field to Business::OnlinePayment. Evaluated as a double-quoted perl string, with the following variables available: $agent
(the agent name), and $pkgs
(a comma-separated list of packages to which the invoiced being charged applies)',
@@ -290,13 +297,6 @@ httemplate/docs/config.html
},
{
- 'key' => 'cybercash3.2',
- 'section' => 'billing',
- 'description' => 'CyberCash Cashregister v3.2 support. Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly\' or `mauthcapture\').',
- 'type' => 'textarea',
- },
-
- {
'key' => 'cyrus',
'section' => 'deprecated',
'description' => 'DEPRECATED, add a cyrus export instead. This option used to integrate with Cyrus IMAP Server, three lines: IMAP server, admin username, and admin password. Cyrus::IMAP::Admin should be installed locally and the connection to the server secured.',
@@ -325,6 +325,13 @@ httemplate/docs/config.html
},
{
+ 'key' => 'unapplypayments',
+ 'section' => 'UI',
+ 'description' => 'Enable "unapplication" of unclosed payments.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'dirhash',
'section' => 'shell',
'description' => 'Optional numeric value to control directory hashing. If positive, hashes directories for the specified number of levels from the front of the username. If negative, hashes directories for the specified number of levels from the end of the username. Some examples: