X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands_withdomain.pm;h=004c4213340deacb90184b589538002f71ef7cbf;hb=ffa18709ee8a4d05e18d2d406cf73afe79e52524;hp=7c5d9045f8b1bdf84e16616d5b150dfac40ae9c8;hpb=30ceabb9d40844452fae8e7c5535fd6a6738b0cd;p=freeside.git diff --git a/FS/FS/part_export/shellcommands_withdomain.pm b/FS/FS/part_export/shellcommands_withdomain.pm index 7c5d9045f..004c42133 100644 --- a/FS/FS/part_export/shellcommands_withdomain.pm +++ b/FS/FS/part_export/shellcommands_withdomain.pm @@ -15,6 +15,9 @@ tie my %options, 'Tie::IxHash', type =>'textarea', #default=>"$_password\n$_password\n", }, + 'useradd_no_queue' => { label => 'Run immediately', + type => 'checkbox', + }, 'userdel' => { label=>'Delete command', #default=>'', }, @@ -22,6 +25,9 @@ tie my %options, 'Tie::IxHash', type =>'textarea', #default=>'', }, + 'userdel_no_queue' => { label => 'Run immediately', + type => 'checkbox', + }, 'usermod' => { label=>'Modify command', default=>'', }, @@ -29,6 +35,9 @@ tie my %options, 'Tie::IxHash', type =>'textarea', #default=>"$_password\n$_password\n", }, + 'usermod_no_queue' => { label => 'Run immediately', + type => 'checkbox', + }, 'usermod_pwonly' => { label=>'Disallow username, domain, uid, dir and RADIUS group changes', type =>'checkbox', }, @@ -41,28 +50,46 @@ tie my %options, 'Tie::IxHash', 'suspend_stdin' => { label=>'Suspension command STDIN', default=>'', }, + 'suspend_no_queue' => { label => 'Run immediately', + type => 'checkbox', + }, 'unsuspend' => { label=>'Unsuspension command', default=>'', }, 'unsuspend_stdin' => { label=>'Unsuspension command STDIN', default=>'', }, + 'unsuspend_no_queue' => { label => 'Run immediately', + type => 'checkbox', + }, 'crypt' => { label => 'Default password encryption', - type=>'select', options=>[qw(crypt md5)], - default => 'crypt', + type=>'select', options=>[qw(crypt md5 sha512)], + default => 'sha512', }, + 'fail_on_output' => { + label => 'Treat any output from the command as an error', + type => 'checkbox', + }, + 'ignore_all_errors' => { + label => 'Ignore all errors from the command', + type => 'checkbox', + }, + 'ignored_errors' => { label => 'Regexes of specific errors to ignore, separated by newlines', + type => 'textarea' + }, ; %info = ( - 'svc' => 'svc_acct', - 'desc' => 'Real-time export via remote SSH (vpopmail, ISPMan)', - 'options' => \%options, - 'notes' => <<'END' + 'svc' => 'svc_acct', + 'desc' => 'Real-time export via remote SSH (vpopmail, ISPMan, MagicMail)', + 'options' => \%options, + 'svc_machine' => 1, + 'notes' => <<'END' Run remote commands via SSH. username@domain (rather than just usernames) are considered unique (also see shellcommands). You probably want this if the commands you are running will accept a domain as a parameter, and will allow the same username with different domains. You will need to -setup SSH for unattended operation. +setup SSH for unattended operation.

Use these buttons for some useful presets: The following variables are available for interpolation (prefixed with @@ -103,7 +141,32 @@ The following variables are available for interpolation (prefixed with
  • $shell
  • $quota
  • @radius_groups -
  • All other fields in svc_acct are also available. +
  • $reasonnum (when suspending) +
  • $reasontext (when suspending) +
  • $reasontypenum (when suspending) +
  • $reasontypetext (when suspending) +
  • $pkgnum +
  • $custnum +
  • All other fields in svc_acct are also available. +
  • The following fields from cust_main are also available (except during replace): company, address1, address2, city, state, zip, county, daytime, night, fax, otaker, agent_custid, locale. When used on the command line (rather than STDIN), they will be quoted for the shell already (do not add additional quotes). + +For the package changed command only, the following fields are also available: + END );