package FS::part_export::vpopmail;
-use vars qw(@ISA @saltset $exportdir $rsync $ssh);
+use vars qw(@ISA @saltset $exportdir);
+use Fcntl qw(:flock);
use File::Path;
use FS::UID qw( datasrc );
use FS::part_export;
@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-$rsync = "rsync";
-$ssh = "ssh";
-
sub rebless { shift; }
sub _export_insert {
crypt($svc_acct->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
$svc_acct->domain,
$svc_acct->quota,
+ $svc_acct->finger,
);
}
return '' unless $old->_password ne $new->_password;
$self->vpopmail_queue( $new->svcnum, 'replace',
- $new->username, $cpassword, $new->domain, $new->quota );
+ $new->username, $cpassword, $new->domain, $new->quota, $new->finger );
}
sub _export_delete {
#a good idea to queue anything that could fail or take any time
sub vpopmail_queue {
my( $self, $svcnum, $method ) = (shift, shift, shift);
+
my $exportdir = "/usr/local/etc/freeside/export." . datasrc;
+ mkdir $exportdir, 0700 or die $! unless -d $exportdir;
+ $exportdir .= "/vpopmail";
+ mkdir $exportdir, 0700 or die $! unless -d $exportdir;
+ $exportdir .= '/'. $self->machine;
+ mkdir $exportdir, 0700 or die $! unless -d $exportdir;
+ mkdir "$exportdir/domains", 0700 or die $! unless -d "$exportdir/domains";
+
my $queue = new FS::queue {
'svcnum' => $svcnum,
'job' => "FS::part_export::vpopmail::vpopmail_$method",
$self->option('dir'),
$self->option('uid'),
$self->option('gid'),
+ $self->option('restart'),
@_
);
}
sub vpopmail_insert { #subroutine, not method
- my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
- my( $username, $password, $domain, $quota ) = @_;
-
+ my( $exportdir, $machine, $dir, $uid, $gid, $restart ) = splice @_,0,6;
+ my( $username, $password, $domain, $quota, $finger ) = @_;
+
+ mkdir "$exportdir/domains/$domain", 0700 or die $!
+ unless -d "$exportdir/domains/$domain";
+
(open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
and flock(VPASSWD,LOCK_EX)
) or die "can't open vpasswd file for $username\@$domain: ".
close(VPASSWD);
for my $mkdir (
- map { "$exportdir/domains/$domain/$username$_" }
- ( '', qw( /Maildir /Maildir/cur /Maildir/new /Maildir/tmp ) )
+ grep { ! -d $_ } map { "$exportdir/domains/$domain/$username$_" }
+ ( '', qw( /Maildir /Maildir/cur /Maildir/new /Maildir/tmp ) )
) {
mkdir $mkdir, 0700 or die "can't mkdir $mkdir: $!";
}
- vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+ vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid, $restart );
}
sub vpopmail_replace { #subroutine, not method
- my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
- my( $username, $password, $domain ) = @_;
+ my( $exportdir, $machine, $dir, $uid, $gid, $restart ) = splice @_,0,6;
+ my( $username, $password, $domain, $quota, $finger ) = @_;
(open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
and flock(VPASSWD,LOCK_EX)
'1',
'0',
$finger,
- $dir,
+ "$dir/domains/$domain/$username", #$vdir
$quota ? $quota.'S' : 'NOQUOTA',
), "\n";
}
flock(VPASSWD,LOCK_UN);
close(VPASSWD);
- vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+ vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid, $restart );
}
sub vpopmail_delete { #subroutine, not method
- my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+ my( $exportdir, $machine, $dir, $uid, $gid, $restart ) = splice @_,0,6;
my( $username, $domain ) = @_;
(open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
rmtree "$exportdir/domains/$domain/$username"
or die "can't rmtree $exportdir/domains/$domain/$username: $!";
- vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+ vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid, $restart );
}
sub vpopmail_sync {
- my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+ my( $exportdir, $machine, $dir, $uid, $gid, $restart ) = splice @_,0,6;
chdir $exportdir;
# my @args = ( $rsync, "-rlpt", "-e", $ssh, "domains/",
'STDERR: '. join(" / ", $rsync->err). ', '.
'STDOUT: '. join(" / ", $rsync->out);
}
+
+ eval "use Net::SSH qw(ssh);";
+ die $@ if $@;
+
+ ssh("vpopmail\@$machine", $restart) if $restart;
}