X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=b08fbb3f2be24058e5baa2da7e1233b6230eec74;hb=de37d7a1d6a044cc7ec75017ee6e413f89b66dc1;hp=f3706f7ab778f42499e38ca77798136263352c63;hpb=70dcaf5ee8a66d301e7fde72dd9514b22649ecb5;p=freeside.git
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f3706f7ab..b08fbb3f2 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -637,6 +637,20 @@ httemplate/docs/config.html
},
{
+ 'key' => 'password-noampersand',
+ 'section' => 'password',
+ 'description' => 'Disallow ampersands in passwords',
+ 'type' => 'checkbox',
+ },
+
+ {
+ 'key' => 'password-noexclamation',
+ 'section' => 'password',
+ 'description' => 'Disallow exclamations in passwords (Not setting this could break old text Livingston or Cistron Radius servers)',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'qmailmachines',
'section' => 'deprecated',
'description' => 'DEPRECATED, add qmail and shellcommands exports instead. This option used to export `/var/qmail/control/virtualdomains\', `/var/qmail/control/recipientmap\', and `/var/qmail/control/rcpthosts\'. Setting this option (even if empty) also turns on user `.qmail-extension\' file maintenance in conjunction with the shellmachine option.',
@@ -665,8 +679,8 @@ httemplate/docs/config.html
{
'key' => 'report_template',
- 'section' => 'required',
- 'description' => 'Required template file for reports. See the billing documentation for details.',
+ 'section' => 'deprecated',
+ 'description' => 'Deprecated template file for reports.',
'type' => 'textarea',
},
@@ -1242,6 +1256,14 @@ httemplate/docs/config.html
'type' => 'textarea',
},
+ {
+ 'key' => 'global_unique-username',
+ 'section' => 'username',
+ 'description' => 'Global username uniqueness control: none (usual setting - check uniqueness per exports), username (all usernames are globally unique, regardless of domain or exports), or username@domain (all username@domain pairs are globally unique, regardless of exports)',
+ 'type' => 'select',
+ 'select_enum' => [ 'none', 'username', 'username@domain' ],
+ },
+
);
1;