X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export.pm;h=d62bef50df5fe36a9518b901c4dcd1cbe0860a09;hb=0354f39ed0e74fd2eae1d9da13906625b4f56591;hp=9645feb981800952a6c87c0afda9ec44972bea44;hpb=f97fd1dc04ae1bc8a130aecff0038a0e52cef82b;p=freeside.git
diff --git a/FS/FS/part_export.pm b/FS/FS/part_export.pm
index 9645feb98..d62bef50d 100644
--- a/FS/FS/part_export.pm
+++ b/FS/FS/part_export.pm
@@ -274,8 +274,6 @@ sub check {
;
return $error if $error;
- warn $self->machine. "!!!\n";
-
$self->machine =~ /^([\w\-\.]*)$/
or return "Illegal machine: ". $self->machine;
$self->machine($1);
@@ -554,6 +552,18 @@ tie my %shellcommands_options, 'Tie::IxHash',
type =>'textarea',
default=>'',
},
+ 'suspend' => { label=>'Suspension command',
+ default=>'',
+ },
+ 'suspend_stdin' => { label=>'Suspension command STDIN',
+ default=>'',
+ },
+ 'unsuspend' => { label=>'Unsuspension command',
+ default=>'',
+ },
+ 'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
+ default=>'',
+ },
;
tie my %shellcommands_withdomain_options, 'Tie::IxHash',
@@ -579,6 +589,18 @@ tie my %shellcommands_withdomain_options, 'Tie::IxHash',
type =>'textarea',
#default=>"$_password\n$_password\n",
},
+ 'suspend' => { label=>'Suspension command',
+ default=>'',
+ },
+ 'suspend_stdin' => { label=>'Suspension command STDIN',
+ default=>'',
+ },
+ 'unsuspend' => { label=>'Unsuspension command',
+ default=>'',
+ },
+ 'unsuspend_stdin' => { label=>'Unsuspension command STDIN',
+ default=>'',
+ },
;
tie my %www_shellcommands_options, 'Tie::IxHash',
@@ -641,10 +663,13 @@ tie my %infostreet_options, 'Tie::IxHash',
;
tie my %vpopmail_options, 'Tie::IxHash',
- 'machine' => { label=>'vpopmail machine', },
+ #'machine' => { label=>'vpopmail machine', },
'dir' => { label=>'directory', }, # ?more info? default?
'uid' => { label=>'vpopmail uid' },
'gid' => { label=>'vpopmail gid' },
+ 'restart' => { label=> 'vpopmail restart command',
+ default=> 'cd /home/vpopmail/domains; for domain in *; do /home/vpopmail/bin/vmkpasswd $domain; done; /var/qmail/bin/qmail-newu; killall -HUP qmail-send',
+ },
;
tie my %bind_options, 'Tie::IxHash',
@@ -699,6 +724,34 @@ tie my %sqlmail_options, 'Tie::IxHash',
'password' => { label=>'Database password' },
;
+tie my %ldap_options, 'Tie::IxHash',
+ 'dn' => { label=>'Root DN' },
+ 'password' => { label=>'Root DN password' },
+ 'userdn' => { label=>'User DN' },
+ 'attributes' => { label=>'Attributes',
+ type=>'textarea',
+ default=>join("\n",
+ 'uid $username',
+ 'mail $username\@$domain',
+ 'uidno $uid',
+ 'gidno $gid',
+ 'cn $first',
+ 'sn $last',
+ 'mailquota $quota',
+ 'vmail',
+ 'location',
+ 'mailtag',
+ 'mailhost',
+ 'mailmessagestore $dir',
+ 'userpassword $crypt_password',
+ 'hint',
+ 'answer $sec_phrase',
+ 'objectclass top,person,inetOrgPerson',
+ ),
+ },
+ 'radius' => { label=>'Export RADIUS attributes', type=>'checkbox', },
+;
+
#export names cannot have dashes...
%exports = (
@@ -732,7 +785,7 @@ tie my %sqlmail_options, 'Tie::IxHash',
'desc' => 'Real-time export via remote SSH (i.e. useradd, userdel, etc.)',
'options' => \%shellcommands_options,
'nodomain' => 'Y',
- 'notes' => 'Run remote commands via SSH. Usernames are considered unique (also see shellcommands_withdomain). You probably want this if the commands you are running will not accept a domain as a parameter. You will need to setup SSH for unattended operation.
Use these buttons for some useful presets: