X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fsvc_acct.export;h=11178c962924a2a91346d5db594ab29be05df6d3;hp=a7a21b3e58005cd1f95b2d380c783a794adda86a;hb=b35b650a6078d645d6f97620f3c79ae941915dd9;hpb=4d513ff5a17bd3b697502b54c9516577a0a8d3e4 diff --git a/bin/svc_acct.export b/bin/svc_acct.export index a7a21b3e5..11178c962 100755 --- a/bin/svc_acct.export +++ b/bin/svc_acct.export @@ -1,18 +1,11 @@ #!/usr/bin/perl -w # -# $Id: svc_acct.export,v 1.22 2001-08-12 19:41:25 jeff Exp $ +# $Id: svc_acct.export,v 1.33 2002-02-18 00:13:57 jeff Exp $ # # Create and export password, radius and vpopmail password files: # passwd, passwd.adjunct, shadow, acp_passwd, acp_userinfo, acp_dialup # users/assign, domains/vdomain/vpasswd # Also export sendmail and qmail config files. -# -# -# $Log: svc_acct.export,v $ -# Revision 1.22 2001-08-12 19:41:25 jeff -# merging vpopmail support branch -# -# use strict; use vars qw($conf); @@ -29,6 +22,9 @@ use FS::svc_acct; use FS::svc_domain; use FS::svc_forward; +my $ssh='ssh'; +my $rsync='rsync'; + my $user = shift or die &usage; adminsuidsetup $user; @@ -55,7 +51,7 @@ my @radiusmachines = $conf->config('radiusmachines') my $icradiusmachines = $conf->exists('icradiusmachines'); my @icradiusmachines = $conf->config('icradiusmachines') if $icradiusmachines; my $icradius_mysqldest = - $conf->config('icradius_mysqldest') || "/usr/local/var/" + $conf->config('icradius_mysqldest') || "/usr/local/var" if $icradiusmachines; my $icradius_mysqlsource = $conf->config('icradius_mysqlsource') || "/usr/local/var/freeside" @@ -63,7 +59,7 @@ my $icradius_mysqlsource = my $icradius_dbh; if ( $icradiusmachines && $conf->exists('icradius_secrets') ) { $icradius_dbh = DBI->connect($conf->config('icradius_secrets')) - or die $DBI::errstr;; + or die $DBI::errstr; } else { $icradius_dbh = dbh; } @@ -73,10 +69,21 @@ my $textradiusprepend = ? $conf->config('textradiusprepend') : ''; +warn "using depriciated textradiusprepend file" if $textradiusprepend; + + +my $radiusprepend = + $conf->exists('radiusprepend') + ? join("\n", $conf->config('radiusprepend')) + : ''; + my @vpopmailmachines = $conf->config('vpopmailmachines') if $conf->exists('vpopmailmachines'); +my $vpopmailrestart = ''; +$vpopmailrestart = $conf->config('vpopmailrestart') + if $conf->exists('vpopmailrestart'); -my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachines[0]); +my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachines[0]) if $vpopmailmachines[0]; my($shellmachine, @qmailmachines); if ( $conf->exists('qmailmachines') ) { @@ -192,6 +199,8 @@ if ( $icradiusmachines ) { setpriority(0,0,10); +print USERS "$radiusprepend\n"; + my %usernames; ## this hack helps keep the passwd files sane my @sendmail; @@ -214,7 +223,7 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) { "-", "", "", - ), "\n"; + ), "\n" if $vpopmailmachines[0]; (mkdir "$spooldir/domains/" . $domain, 0700) or die "Can't create $spooldir/domains/" . $domain .": $!"; @@ -229,7 +238,7 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) { my ($svc_acct); - if ($svc_domain->catchall) { + if ($svc_domain->getfield('catchall')) { $svc_acct = qsearchs('svc_acct', {'svcnum' => $svc_domain->catchall}); die "Cannot find catchall account for domain $domain\n" unless $svc_acct; @@ -241,12 +250,14 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) { ### # FORMAT OF THE .QMAIL-DEFAULT FILE HERE - print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" $username\@$domain\n"; + print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" " . $svc_acct->email . "\n" + if $vpopmailmachines[0]; }else{ ### # FORMAT OF THE .QMAIL-DEFAULT FILE HERE - print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" bounce-no-mailbox\n"; + print QMAILDEFAULT "| $vpopdir/bin/vdelivermail \"\" bounce-no-mailbox\n" + if $vpopmailmachines[0]; } print VPOPVIRTUALDOMAINS "$domain:$domain\n"; @@ -254,7 +265,8 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) { foreach $svc_acct (qsearch('svc_acct', {'domsvc' => $svc_domain->svcnum})) { my($password)=$svc_acct->getfield('_password'); my($cpassword,$rpassword); - if ( ( length($password) <= 8 ) + #if ( ( length($password) <= 8 ) + if ( ( length($password) <= 12 ) && ( $password ne '*' ) && ( $password ne '!!' ) && ( $password ne '' ) @@ -278,6 +290,10 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) { $username=$svc_acct->username . $svc_acct->domsvc; } elsif ($userpolicy =~ /^append domain$/) { $username=$svc_acct->username . $svc_domain->domain; + } elsif ($userpolicy =~ /^append domain$/) { + $username=$svc_acct->username . $svc_domain->domain; + } elsif ($userpolicy =~ /^append \@domain$/) { + $username=$svc_acct->username . '@'. $svc_domain->domain; } else { die "Unknown policy in username_policy\n"; } @@ -337,20 +353,20 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) { '', ), "\n"; } + } - ### - # FORMAT OF THE VPASSWD FILE HERE - print VPASSWD join(":", - $svc_acct->username, - $cpassword, - '1', - '0', - $svc_acct->username, - "$vpopdir/domains/" . $svc_domain->domain ."/" . $svc_acct->username, - 'NOQUOTA', - ), "\n"; + ### + # FORMAT OF THE VPASSWD FILE HERE + print VPASSWD join(":", + $svc_acct->username, + $cpassword, + '1', + '0', + $svc_acct->username, + "$vpopdir/domains/" . $svc_domain->domain ."/" . $svc_acct->username, + 'NOQUOTA', + ), "\n"; - } if ( $svc_acct->slipip ne '' ) { @@ -432,6 +448,18 @@ foreach $svc_domain (sort {$a->domain cmp $b->domain} @svc_domain) { ) ). " )" ); $sth->execute or die "Can't insert into radreply table: ". $sth->errstr; } + + if ( $ip && $ip ne '0e0' ) { + my $sth = $icradius_dbh->prepare( + "INSERT INTO radreply (id, UserName, Attribute, Value) VALUES ( ". + join(", ", map { $icradius_dbh->quote( $_ ) } ( + '', + $username, + 'Framed-IP-Address', + $ip, + ) ). " )" + ); + $sth->execute or die "Can't insert into radreply table: ". $sth->errstr; } } } @@ -552,7 +580,8 @@ foreach $bsdshellmachine (@bsdshellmachines) { ssh("root\@$bsdshellmachine", "( ". "mv /etc/passwd.new /etc/passwd; ". - "mv /etc/master.passwd.new /etc/master.passwd; ". + #"mv /etc/master.passwd.new /etc/master.passwd; ". + "pwd_mkdb /etc/master.passwd.new; ". " )" ) == 0 or die "ssh error: $!"; @@ -622,26 +651,32 @@ foreach my $icradiusmachine ( @icradiusmachines ) { close WRITER; } -my @args = ("/bin/tar", "c", "--force-local", "-C", "$spooldir", "-f", "$spooldir/vpoptarball", "domains"); +#my @args = ("/bin/tar", "c", "--force-local", "-C", "$spooldir", "-f", "$spooldir/vpoptarball", "domains"); -system {$args[0]} @args; +#system {$args[0]} @args; my($vpopmailmachine); foreach $vpopmailmachine (@vpopmailmachines) { my ($machine, $vpopdir, $vpopuid, $vpopgid) = split (/\s+/, $vpopmailmachine); my $scp = new Net::SCP; - $scp->scp("$spooldir/vpoptarball","root\@$machine:vpoptarball") - or die "scp error: ". $scp->{errstr}; - ssh("root\@$machine", - "( ". - "tar xf vpoptarball; ". - "chown -R $vpopuid:$vpopgid domains; ". - "tar cf vpoptarball domains; ". - "cd $vpopdir; ". - "tar xf ~/vpoptarball; ". - " )" - ) - == 0 or die "ssh error: $!"; +# $scp->scp("$spooldir/vpoptarball","root\@$machine:vpoptarball") +# or die "scp error: ". $scp->{errstr}; +# ssh("root\@$machine", +# "( ". +# "rm -rf domains; ". +# "tar xf vpoptarball; ". +# "chown -R $vpopuid:$vpopgid domains; ". +# "tar cf vpoptarball domains; ". +# "cd $vpopdir; ". +# "tar xf ~/vpoptarball; ". +# " )" +# ) +# == 0 or die "ssh error: $!"; + + chdir $spooldir; + my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpopdir/domains/"); + + system {$args[0]} @args; $scp->scp("$spooldir/assign","root\@$machine:/var/qmail/users/assign") or die "scp error: ". $scp->{errstr}; @@ -649,6 +684,15 @@ foreach $vpopmailmachine (@vpopmailmachines) { or die "scp error: ". $scp->{errstr}; $scp->scp("$spooldir/vpoprcpthosts","root\@$machine:/var/qmail/control/rcpthosts") or die "scp error: ". $scp->{errstr}; + + ssh("root\@$machine", + "( ". + $vpopmailrestart . + " )" + ) + == 0 or die "ssh error: $!"; + + } my($sendmailmachine);