X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=126461763db52c8f2db148c1a66401bd04619ab2;hb=8203228392fc2f15f568dbdfdace2d70baad681c;hp=b0291325867fbb877364f9d85f54472a9f2f5d0f;hpb=327df8aefdcf96c9c83805570abf4cc242cf46b9;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b02913258..126461763 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -298,8 +298,8 @@ httemplate/docs/config.html
{
'key' => 'cyrus',
- 'section' => 'mail',
- 'description' => 'Integration 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.',
+ '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.',
'type' => 'textarea',
},
@@ -481,7 +481,7 @@ httemplate/docs/config.html
{
'key' => 'defaultrecords',
'section' => 'BIND',
- 'description' => 'DNS entries add automatically when creating a domain',
+ 'description' => 'DNS entries to add automatically when creating a domain',
'type' => 'editlist',
'editlist_parts' => [ { type=>'text' },
{ type=>'immutable', value=>'IN' },
@@ -604,29 +604,29 @@ httemplate/docs/config.html
{
'key' => 'shellmachine',
- 'section' => 'shell',
- 'description' => 'A single machine with user home directories mounted. This enables home directory creation, renaming and archiving/deletion. In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
+ 'section' => 'deprecated',
+ 'description' => 'DEPRECATED, add a shellcommands export instead. This option used to contain a single machine with user home directories mounted. This enables home directory creation, renaming and archiving/deletion. In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
'type' => 'text',
},
{
'key' => 'shellmachine-useradd',
- 'section' => 'shell',
- 'description' => 'The command(s) to run on shellmachine when an account is created. If the shellmachine option is set but this option is not, useradd -d $dir -m -s $shell -u $uid $username
is the default. If this option is set but empty, cp -pr /etc/skel $dir; chown -R $uid.$gid $dir
is the default instead. Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: $username
, $uid
, $gid
, $dir
, and $shell
.',
+ 'section' => 'deprecated',
+ 'description' => 'DEPRECATED, add a shellcommands export instead. This option used to contain command(s) to run on shellmachine when an account is created. If the shellmachine option is set but this option is not, useradd -d $dir -m -s $shell -u $uid $username
is the default. If this option is set but empty, cp -pr /etc/skel $dir; chown -R $uid.$gid $dir
is the default instead. Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: $username
, $uid
, $gid
, $dir
, and $shell
.',
'type' => [qw( checkbox text )],
},
{
'key' => 'shellmachine-userdel',
- 'section' => 'shell',
- 'description' => 'The command(s) to run on shellmachine when an account is deleted. If the shellmachine option is set but this option is not, userdel $username
is the default. If this option is set but empty, rm -rf $dir
is the default instead. Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: $username
and $dir
.',
+ 'section' => 'deprecated',
+ 'description' => 'DEPRECATED, add a shellcommands export instead. This option used to contain command(s) to run on shellmachine when an account is deleted. If the shellmachine option is set but this option is not, userdel $username
is the default. If this option is set but empty, rm -rf $dir
is the default instead. Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: $username
and $dir
.',
'type' => [qw( checkbox text )],
},
{
'key' => 'shellmachine-usermod',
- 'section' => 'shell',
- 'description' => 'The command(s) to run on shellmachine when an account is modified. If the shellmachine option is set but this option is empty, [ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )
is the default. Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: $old_dir
, $new_dir
, $uid
and $gid
.',
+ 'section' => 'deprecated',
+ 'description' => 'DEPRECATED, add a shellcommands export instead. This option used to contain command(s) to run on shellmachine when an account is modified. If the shellmachine option is set but this option is empty, [ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )
is the default. Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: $old_dir
, $new_dir
, $uid
and $gid
.',
#'type' => [qw( checkbox text )],
'type' => 'text',
},
@@ -778,6 +778,20 @@ httemplate/docs/config.html
'type' => 'checkbox',
},
+ {
+ 'key' => 'username-nounderscore',
+ 'section' => 'username',
+ 'description' => 'Disallow underscores in usernames',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'username-nodash',
+ 'section' => 'username',
+ 'description' => 'Disallow dashes in usernames',
+ 'type' => 'checkbox',
+ },
+
{
'key' => 'username-uppercase',
'section' => 'username',
@@ -796,8 +810,8 @@ httemplate/docs/config.html
{
'key' => 'vpopmailmachines',
- 'section' => 'mail',
- 'description' => 'Your vpopmail pop toasters, one per line. Each line is of the form "machinename vpopdir vpopuid vpopgid". For example: poptoaster.domain.tld /home/vpopmail 508 508
Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
+ 'section' => 'deprecated',
+ 'description' => 'DEPRECATED, add a cp export instead. This option used to contain your vpopmail pop toasters, one per line. Each line is of the form "machinename vpopdir vpopuid vpopgid". For example: poptoaster.domain.tld /home/vpopmail 508 508
Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
'type' => 'textarea',
},
@@ -895,7 +909,33 @@ httemplate/docs/config.html
'type' => 'checkbox',
},
+ {
+ 'key' => 'declinetemplate',
+ 'section' => 'billing',
+ 'description' => 'Template file for credit card decline emails.',
+ 'type' => 'textarea',
+ },
+
+ {
+ 'key' => 'emaildecline',
+ 'section' => 'billing',
+ 'description' => 'Enable emailing of credit card decline notices.',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'require_cardname',
+ 'section' => 'billing',
+ 'description' => 'Require an "Exact name on card" to be entered explicitly; don\'t default to using the first and last name.',
+ 'type' => 'checkbox',
+ },
+ {
+ 'key' => 'enable_taxclasses',
+ 'section' => 'billing',
+ 'description' => 'Enable per-package tax classes',
+ 'type' => 'checkbox',
+ },
);