X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=e45793b51feaff3df15731b0bf83e1cf250e28f3;hb=8556d71539c53a4016b0d32d1e4fed8f17d7a853;hp=c8f0d81afaf5c2540ec2278d55280efe2141775a;hpb=0cbeb01df08457b056a7ae775b4924c266b4228b;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c8f0d81af..e45793b51 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' => '<b>DEPRECATED</b>, add <i>qmail</i> and <i>shellcommands</i> <a href="../browse/part_export.cgi">exports</a> 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 <b>shellmachine</b> option.',
@@ -935,8 +949,8 @@ httemplate/docs/config.html
 
   {
     'key'         => 'safe-part_pkg',
-    'section'     => 'UI',
-    'description' => 'Validates package definition setup and recur expressions against a preset list.  Useful for webdemos, annoying to powerusers.',
+    'section'     => 'deprecated',
+    'description' => '<b>DEPRECATED</b>, obsolete.  Used to validate package definition setup and recur expressions against a preset list.  Useful for webdemos, annoying to powerusers.',
     'type'        => 'checkbox',
   },
 
@@ -1050,7 +1064,7 @@ httemplate/docs/config.html
   {
     'key'         => 'signup_server-realtime',
     'section'     => '',
-    'description' => 'Run billing for signup server signups immediately, and suspend accounts which subsequently have a balance.',
+    'description' => 'Run billing for signup server signups immediately, and do not provision accounts which subsequently have a balance.',
     'type'        => 'checkbox',
   },
 
@@ -1283,6 +1297,72 @@ httemplate/docs/config.html
     'type'        => 'checkbox',
   },
 
+  {
+    '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' ],
+  },
+
+  {
+    'key'         => 'svc_external-skip_manual',
+    'section'     => 'UI',
+    'description' => 'When provisioning svc_external services, skip manual entry of id and title fields in the UI.  Usually used in conjunction with an export that populates these fields (i.e. artera_turbo).',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'svc_external-display_type',
+    'section'     => 'UI',
+    'description' => 'Select a specific svc_external type to enable some UI changes specific to that type (i.e. artera_turbo).',
+    'type'        => 'select',
+    'select_enum' => [ 'generic', 'artera_turbo', ],
+  },
+
+  {
+    'key'         => 'ticket_system',
+    'section'     => '',
+    'description' => 'Ticketing system integraiton.  <b>RT_Internal</b> uses the built-in RT ticketing system (use <code>make create-rt</code> to create the necessary tables).  <b>RT_Libs</b> uses the built-in RT libraries to access an RT installation in a separate database (local or remote).  <b>RT_External</b> uses RT\'s XML interface and RTx::Atom to access an RT installation in a separate database (local or remote).',
+    'type'        => 'select',
+    'select_enum' => [ '', qw(RT_Internal RT_Libs RT_External) ],
+  },
+
+  {
+    'key'         => 'ticket_system-default_queueid',
+    'section'     => '',
+    'description' => 'Default queue number used when creating new customer tickets.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'ticket_system-custom_priority_field',
+    'section'     => '',
+    'description' => 'Custom field from the ticketing system to use as a custom priority classification.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'ticket_system-custom_priority_field-values',
+    'section'     => '',
+    'description' => 'Values for the custom field from the ticketing system tobreak down and sort customer ticket lists.',
+    'type'        => 'textarea',
+  },
+
+  {
+    'key'         => 'ticket_system-custom_priority_field_queue',
+    'section'     => '',
+    'description' => 'Ticketing system queue in which the custom field specified in ticket_system-custom_priority_field is located.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'company_name',
+    'section'     => 'required',
+    'description' => 'Your company name',
+    'type'        => 'text',
+  },
+
 );
 
 1;