{
'key' => 'shellmachine',
'section' => 'deprecated',
- 'description' => '<b>DEPRECATED</b>, add a <i>
cp</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain a single machine with user home directories mounted. This enables home directory creation, renaming and archiving/deletion. In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
+ 'description' => '<b>DEPRECATED</b>, add a <i>
shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain a single machine with user home directories mounted. This enables home directory creation, renaming and archiving/deletion. In conjunction with `qmailmachines\', it also enables `.qmail-extension\' file maintenance.',
'type' => 'text',
},
{
'key' => 'shellmachine-useradd',
'section' => 'deprecated',
- 'description' => '<b>DEPRECATED</b>, add a <i>
cp</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain command(s) to run on shellmachine when an account is created. If the <b>shellmachine</b> option is set but this option is not, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default. If this option is set but empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead. Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
+ 'description' => '<b>DEPRECATED</b>, add a <i>
shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain command(s) to run on shellmachine when an account is created. If the <b>shellmachine</b> option is set but this option is not, <code>useradd -d $dir -m -s $shell -u $uid $username</code> is the default. If this option is set but empty, <code>cp -pr /etc/skel $dir; chown -R $uid.$gid $dir</code> is the default instead. Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code>, <code>$uid</code>, <code>$gid</code>, <code>$dir</code>, and <code>$shell</code>.',
'type' => [qw( checkbox text )],
},
{
'key' => 'shellmachine-userdel',
'section' => 'deprecated',
- 'description' => '<b>DEPRECATED</b>, add a <i>
cp</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain command(s) to run on shellmachine when an account is deleted. If the <b>shellmachine</b> option is set but this option is not, <code>userdel $username</code> is the default. If this option is set but empty, <code>rm -rf $dir</code> is the default instead. Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
+ 'description' => '<b>DEPRECATED</b>, add a <i>
shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain command(s) to run on shellmachine when an account is deleted. If the <b>shellmachine</b> option is set but this option is not, <code>userdel $username</code> is the default. If this option is set but empty, <code>rm -rf $dir</code> is the default instead. Otherwise the value is evaluated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.',
'type' => [qw( checkbox text )],
},
{
'key' => 'shellmachine-usermod',
'section' => 'deprecated',
- 'description' => '<b>DEPRECATED</b>, add a <i>
cp</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain command(s) to run on shellmachine when an account is modified. If the <b>shellmachine</b> option is set but this option is empty, <code>[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default. Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
+ 'description' => '<b>DEPRECATED</b>, add a <i>
shellcommands</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain command(s) to run on shellmachine when an account is modified. If the <b>shellmachine</b> option is set but this option is empty, <code>[ -d $old_dir ] && mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default. Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.',
#'type' => [qw( checkbox text )],
'type' => 'text',
},
{
'key' => 'vpopmailmachines',
- 'section' => 'mail',
- 'description' => 'Your vpopmail pop toasters, one per line. Each line is of the form "machinename vpopdir vpopuid vpopgid". For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code> Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
+ 'section' => 'deprecated',
+ 'description' => '<b>DEPRECATED</b>, add a <i>cp</i> <a href="../browse/part_export.cgi">export</a> instead. This option used to contain your vpopmail pop toasters, one per line. Each line is of the form "machinename vpopdir vpopuid vpopgid". For example: <code>poptoaster.domain.tld /home/vpopmail 508 508</code> Note: vpopuid and vpopgid are values taken from the vpopmail machine\'s /etc/passwd',
'type' => 'textarea',
},
'password' => { label=>'Admin password' },
},
'nodomain' => 'Y',
- 'notes' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>. Cyrus::IMAP::Admin should be installed locally and the connection to the server secured. <B>svc_acct.quota</B> is used to set the Cyrus quota if available. '
+ 'notes' => 'Integration with <a href="http://asg.web.cmu.edu/cyrus/imapd/">Cyrus IMAP Server</a>. Cyrus::IMAP::Admin should be installed locally and the connection to the server secured. <B>svc_acct.quota</B>, if available, is used to set the Cyrus quota. '
},
'cp' => {
'notes' => 'Real-time export to <a href="http://www.infostreet.com/">InfoStreet</a> streetSmartAPI. Requires installation of <a href="http://search.cpan.org/search?dist=Frontier-Client">Frontier::Client</a> from CPAN.',
},
+ 'vpopmail' => {
+ 'desc' => 'Real-time export to vpopmail text files',
+ 'options' => {
+ 'machine' => { label=>'vpopmail machine', },
+ 'dir' => { label=>'directory', }, # ?more info? default?
+ 'uid' => { label=>'vpopmail uid' },
+ 'gid' => { label=>'vpopmail gid' },
+ },
+ 'notes' => 'Real time export to <a href="http://inter7.com/vpopmail/">vpopmail</a> text files (...extended description from jeff?...)',
+ },
+
},
'svc_domain' => {},
-package FS::part_export::myexport;
+package FS::part_export::vpopmail;
-use vars qw(@ISA);
+use vars qw(@ISA @saltset $exportdir $rsync $ssh);
+use File::Path;
+use FS::UID qw( datasrc );
use FS::part_export;
@ISA = qw(FS::part_export);
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
+$rsync = "rsync";
+$ssh = "ssh";
+
sub rebless { shift; }
sub _export_insert {
my($self, $svc_acct) = (shift, shift);
- $self->myexport_queue( $svc_acct->svcnum, 'insert',
- $svc_acct->username, $svc_acct->_password );
+ $self->vpopmail_queue( $svc_acct->svcnum, 'insert',
+ $svc_acct->username,
+ crypt($svc_acct->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
+ $svc_acct->domain,
+ );
}
sub _export_replace {
my( $self, $new, $old ) = (shift, shift, shift);
- #return "can't change username with myexport"
- # if $old->username ne $new->username;
- #return '' unless $old->_password ne $new->_password;
- $self->myexport_queue( $new->svcnum,
- 'replace', $new->username, $new->_password );
+
+ my $cpassword = crypt(
+ $new->_password, $saltset[int(rand(64))].$saltset[int(rand(64))]
+ );
+
+ return "can't change username with vpopmail"
+ if $old->username ne $new->username;
+
+ #no.... if mail can't be preserved, better to disallow username changes
+ #if ($old->username ne $new->username || $old->domain ne $new->domain ) {
+ # vpopmail_queue( $svc_acct->svcnum, 'delete',
+ # $old->username, $old->domain
+ # );
+ # vpopmail_queue( $svc_acct->svcnum, 'insert',
+ # $new->username,
+ # $cpassword,
+ # $new->domain,
+ # );
+
+ return '' unless $old->_password ne $new->_password;
+
+ $self->vpopmail_queue( $new->svcnum, 'replace',
+ $new->username, $cpassword, $new->domain );
}
sub _export_delete {
my( $self, $svc_acct ) = (shift, shift);
- $self->myexport_queue( $svc_acct->svcnum,
- 'delete', $svc_acct->username );
+ $self->vpopmail_queue( $svc_acct->svcnum, 'delete',
+ $svc_acct->username, $svc_acct->domain );
}
#a good idea to queue anything that could fail or take any time
-sub myexport_queue {
+sub vpopmail_queue {
my( $self, $svcnum, $method ) = (shift, shift, shift);
+ my $exportdir = "/usr/local/etc/freeside/export." . datasrc;
my $queue = new FS::queue {
'svcnum' => $svcnum,
- 'job' => "FS::part_export::myexport::myexport_$method",
+ 'job' => "FS::part_export::vpopmail::vpopmail_$method",
};
- $queue->insert( @_ );
+ $queue->insert(
+ $exportdir,
+ $self->option('machine'),
+ $self->option('dir'),
+ $self->option('uid'),
+ $self->option('gid'),
+ @_
+ );
}
-sub myexport_insert { #subroutine, not method
+sub vpopmail_insert { #subroutine, not method
+ my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+ my( $username, $password, $domain ) = @_;
+
+ (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
+ and flock(VPASSWD,LOCK_EX)
+ ) or die "can't open vpasswd file for $username\@$domain: ".
+ "$exportdir/domains/$domain/vpasswd: $!";
+ print VPASSWD join(":",
+ $username,
+ $password,
+ '1',
+ '0',
+ $username,
+ "$dir/domains/$domain/$username",
+ 'NOQUOTA',
+ ), "\n";
+
+ flock(VPASSWD,LOCK_UN);
+ close(VPASSWD);
+
+ for my $mkdir (
+ 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 );
+
+}
+
+sub vpopmail_replace { #subroutine, not method
+ my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+ my( $username, $password, $domain ) = @_;
+
+ (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
+ and flock(VPASSWD,LOCK_EX)
+ ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
+
+ open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
+ or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+ while (<VPASSWD>) {
+ my ($mailbox, $pw, @rest) = split(':', $_);
+ print VPASSWDTMP $_ unless $username eq $mailbox;
+ print VPASSWDTMP join (':', ($mailbox, $password, @rest))
+ if $username eq $mailbox;
+ }
+
+ close(VPASSWDTMP);
+
+ rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
+ or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+ flock(VPASSWD,LOCK_UN);
+ close(VPASSWD);
+
+ vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
+
}
-sub myexport_replace { #subroutine, not method
+
+sub vpopmail_delete { #subroutine, not method
+ my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+ my( $username, $domain ) = @_;
+
+ (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
+ and flock(VPASSWD,LOCK_EX)
+ ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
+
+ open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
+ or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+ while (<VPASSWD>) {
+ my ($mailbox, $rest) = split(':', $_);
+ print VPASSWDTMP $_ unless $username eq $mailbox;
+ }
+
+ close(VPASSWDTMP);
+
+ rename "$exportdir/domains/$domain/vpasswd.tmp",
+ "$exportdir/domains/$domain/vpasswd"
+ or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+ flock(VPASSWD,LOCK_UN);
+ close(VPASSWD);
+
+ rmtree "$exportdir/domains/$domain/$username"
+ or die "can't rmtree $exportdir/domains/$domain/$username: $!";
+
+ vpopmail_sync( $exportdir, $machine, $dir, $uid, $gid );
}
-sub myexport_delete { #subroutine, not method
+
+sub vpopmail_sync {
+ my( $exportdir, $machine, $dir, $uid, $gid ) = splice @_,0,5;
+
+ chdir $exportdir;
+ my @args = ( $rsync, "-rlpt", "-e", $ssh, "domains/",
+ "vpopmail\@$machine:$dir/domains/" );
+ system {$args[0]} @args;
}
+
package FS::svc_acct;
use strict;
-use vars qw( @ISA $nossh_hack $noexport_hack $conf
+use vars qw( @ISA $noexport_hack $conf
$dir_prefix @shells $usernamemin
$usernamemax $passwordmin $passwordmax
$username_ampersand $username_letter $username_letterfirst
$username_noperiod $username_uppercase
$mydomain
$dirhash
- @saltset @pw_set
- $rsync $ssh $exportdir $vpopdir);
+ @saltset @pw_set );
use Carp;
-use File::Path;
use Fcntl qw(:flock);
use FS::UID qw( datasrc );
use FS::Conf;
#ask FS::UID to run this stuff for us later
$FS::UID::callback{'FS::svc_acct'} = sub {
- $rsync = "rsync";
- $ssh = "ssh";
$conf = new FS::Conf;
$dir_prefix = $conf->config('home');
@shells = $conf->config('shells');
$mydomain = $conf->config('domain');
$dirhash = $conf->config('dirhash') || 0;
- $exportdir = "/usr/local/etc/freeside/export." . datasrc;
- if ( $conf->exists('vpopmailmachines') ) {
- my (@vpopmailmachines) = $conf->config('vpopmailmachines');
- my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
- $vpopdir = $dir;
- } else {
- $vpopdir = '';
- }
};
@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
contain an arrayref of group names. See L<FS::radius_usergroup>. (used in
sqlradius export only)
-If the configuration value (see L<FS::Conf>) shellmachine exists, and the
-username, uid, and dir fields are defined, the command(s) specified in
-the shellmachine-useradd configuration are added to the job queue (see
-L<FS::queue> and L<freeside-queued>) to be exectued on shellmachine via ssh.
-This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
-If the shellmachine-useradd configuration file does not exist,
-
- useradd -d $dir -m -s $shell -u $uid $username
-
-is the default. If the shellmachine-useradd configuration file exists but
-it empty,
-
- cp -pr /etc/skel $dir; chown -R $uid.$gid $dir
-
-is the default instead. Otherwise the contents of the file are treated as
-a double-quoted perl string, with the following variables available:
-$username, $uid, $gid, $dir, and $shell.
-
(TODOC: L<FS::queue> and L<freeside-queued>)
(TODOC: new exports! $noexport_hack)
}
}
- #old-style exports
-
- if ( $vpopdir ) {
-
- my $vpopmail_queue =
- new FS::queue {
- 'svcnum' => $self->svcnum,
- 'job' => 'FS::svc_acct::vpopmail_insert'
- };
- $error = $vpopmail_queue->insert( $self->username,
- crypt($self->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
- $self->domain,
- $vpopdir,
- );
- if ( $error ) {
- $dbh->rollback if $oldAutoCommit;
- return "queueing job (transaction rolled back): $error";
- }
-
- }
-
- #end of old-style exports
-
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
''; #no error
}
-sub vpopmail_insert {
- my( $username, $password, $domain, $vpopdir ) = @_;
-
- (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
- and flock(VPASSWD,LOCK_EX)
- ) or die "can't open vpasswd file for $username\@$domain: $exportdir/domains/$domain/vpasswd";
- print VPASSWD join(":",
- $username,
- $password,
- '1',
- '0',
- $username,
- "$vpopdir/domains/$domain/$username",
- 'NOQUOTA',
- ), "\n";
-
- flock(VPASSWD,LOCK_UN);
- close(VPASSWD);
-
- mkdir "$exportdir/domains/$domain/$username", 0700 or die "can't create Maildir";
- mkdir "$exportdir/domains/$domain/$username/Maildir", 0700 or die "can't create Maildir";
- mkdir "$exportdir/domains/$domain/$username/Maildir/cur", 0700 or die "can't create Maildir";
- mkdir "$exportdir/domains/$domain/$username/Maildir/new", 0700 or die "can't create Maildir";
- mkdir "$exportdir/domains/$domain/$username/Maildir/tmp", 0700 or die "can't create Maildir";
-
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
- my $error = $queue->insert;
- die $error if $error;
-
- 1;
-}
-
-sub vpopmail_sync {
-
- my (@vpopmailmachines) = $conf->config('vpopmailmachines');
- my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
-
- chdir $exportdir;
- my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpopdir/domains/");
- system {$args[0]} @args;
-
-}
-
=item delete
Deletes this account from the database. If there is an error, returns the
The corresponding FS::cust_svc record will be deleted as well.
-If the configuration value (see L<FS::Conf>) shellmachine exists, the
-command(s) specified in the shellmachine-userdel configuration file are
-added to the job queue (see L<FS::queue> and L<freeside-queued>) to be executed
-on shellmachine via ssh. This behavior can be surpressed by setting
-$FS::svc_acct::nossh_hack true. If the shellmachine-userdel configuration
-file does not exist,
-
- userdel $username
-
-is the default. If the shellmachine-userdel configuration file exists but
-is empty,
-
- rm -rf $dir
-
-is the default instead. Otherwise the contents of the file are treated as a
-double-quoted perl string, with the following variables available:
-$username and $dir.
-
(TODOC: new exports! $noexport_hack)
=cut
}
}
- #old-style exports
-
- if ( $vpopdir ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
- $error = $queue->insert( $self->username, $self->domain );
- if ( $error ) {
- $dbh->rollback if $oldAutoCommit;
- return "queueing job (transaction rolled back): $error";
- }
-
- }
-
- #end of old-style exports
-
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
}
-sub vpopmail_delete {
- my( $username, $domain ) = @_;
-
- (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
- and flock(VPASSWD,LOCK_EX)
- ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
-
- open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
- or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
-
- while (<VPASSWD>) {
- my ($mailbox, $rest) = split(':', $_);
- print VPASSWDTMP $_ unless $username eq $mailbox;
- }
-
- close(VPASSWDTMP);
-
- rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
- or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
-
- flock(VPASSWD,LOCK_UN);
- close(VPASSWD);
-
- rmtree "$exportdir/domains/$domain/$username" or die "can't destroy Maildir";
- 1;
-}
-
=item replace OLD_RECORD
Replaces OLD_RECORD with this one in the database. If there is an error,
contain an arrayref of group names. See L<FS::radius_usergroup>. (used in
sqlradius export only)
-If the configuration value (see L<FS::Conf>) shellmachine exists, and the
-dir field has changed, the command(s) specified in the shellmachine-usermod
-configuraiton file are added to the job queue (see L<FS::queue> and
-L<freeside-queued>) to be executed on shellmachine via ssh. This behavior can
-be surpressed by setting $FS::svc-acct::nossh_hack true. If the
-shellmachine-userdel configuration file does not exist or is empty,
-
- [ -d $old_dir ] && mv $old_dir $new_dir || (
- chmod u+t $old_dir;
- mkdir $new_dir;
- cd $old_dir;
- find . -depth -print | cpio -pdm $new_dir;
- chmod u-t $new_dir;
- chown -R $uid.$gid $new_dir;
- rm -rf $old_dir
- )
-
-is the default. This behaviour can be surpressed by setting
-$FS::svc_acct::nossh_hack true.
-
=cut
sub replace {
}
}
- #old-style exports
-
- if ( $vpopdir ) {
- my $cpassword = crypt(
- $new->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]
- );
-
- if ($old->username ne $new->username || $old->domain ne $new->domain ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
- $error = $queue->insert( $old->username, $old->domain );
- my $queue2 = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_insert' };
- $error = $queue2->insert( $new->username,
- $cpassword,
- $new->domain,
- $vpopdir,
- )
- unless $error;
- } elsif ($old->_password ne $new->_password) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_replace_password' };
- $error = $queue->insert( $new->username, $cpassword, $new->domain );
- }
- if ( $error ) {
- $dbh->rollback if $oldAutoCommit;
- return "queueing job (transaction rolled back): $error";
- }
- }
-
- #end of old-style exports
-
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
''; #no error
}
-sub vpopmail_replace_password {
- my( $username, $password, $domain ) = @_;
-
- (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
- and flock(VPASSWD,LOCK_EX)
- ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
-
- open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
- or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
-
- while (<VPASSWD>) {
- my ($mailbox, $pw, @rest) = split(':', $_);
- print VPASSWDTMP $_ unless $username eq $mailbox;
- print VPASSWDTMP join (':', ($mailbox, $password, @rest))
- if $username eq $mailbox;
- }
-
- close(VPASSWDTMP);
-
- rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
- or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
-
- flock(VPASSWD,LOCK_UN);
- close(VPASSWD);
-
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
- my $error = $queue->insert;
- die $error if $error;
-
- 1;
-}
-
-
=item suspend
Suspends this account by prefixing *SUSPENDED* to the password. If there is an
<li>Setup SSH keys:
<ul>
<li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>. Since this is for unattended operation, use a blank passphrase.
- <li>Append the newly-created <code>identity.pub</code> file to <code>~root
+ <li>Append the newly-created <code>identity.pub</code> file to <code>~freeside
/.ssh/authorized_keys</code> on the shell or web machine(s).
- <li>Some new SSH v2 implementation accept v2 style keys only. Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
+ <li>Some new SSH v2 implementation accept v2 style keys only. Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~freeside/.ssh/authorized_keys2</code> on the remote machine(s).
</ul>
<li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell or web machine(s). (chown freeside, chmod 500)
<li>Create /usr/local/freeside on the shell or web machine(s). (chown freeside, chmod 700)
# foreach my $option ( qw(url login password groupID ) ) {
my $optinfo = $exports->{$layer}{options}{$option};
my $label = $optinfo->{label};
- my $value = $cgi->param($option) || $part_export->option($option);
+ my $value = $cgi->param($option)
+ || $part_export->option($option)
+ || (exists $optinfo->{default} ? $optinfo->{default} : '');
$html .= qq!<TR><TD ALIGN="right">$label</TD>!.
qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
'</TR>';
projects / freeside.git / commitdiff