diff options
| -rw-r--r-- | FS/FS/part_export/sqlmail.pm | 2 | ||||
| -rwxr-xr-x | FS/bin/freeside-setup | 4 | ||||
| -rwxr-xr-x | bin/bind.export | 15 |
3 files changed, 5 insertions, 16 deletions
diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm index f97674c27..0c0cb367b 100644 --- a/FS/FS/part_export/sqlmail.pm +++ b/FS/FS/part_export/sqlmail.pm @@ -142,7 +142,7 @@ sub update_values { # Update records to conform to a particular server_type. my ($self, $svc, $svcdb) = (shift,shift,shift); - my $svchash = { %{$svc->hashref} } or return ''; # We need a copy. + my $svchash = $svc->hashref or return ''; if ($svcdb eq 'svc_acct') { if ($self->option('server_type') eq 'courier_crypt') { diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup index 518a2ad42..8ec014186 100755 --- a/FS/bin/freeside-setup +++ b/FS/bin/freeside-setup @@ -471,7 +471,7 @@ sub tables_hash_hack { 'last', 'varchar', '', $char_d, # 'middle', 'varchar', 'NULL', $char_d, 'first', 'varchar', '', $char_d, - 'ss', 'varchar', 'NULL', 11, + 'ss', 'char', 'NULL', 11, 'company', 'varchar', 'NULL', $char_d, 'address1', 'varchar', '', $char_d, 'address2', 'varchar', 'NULL', $char_d, @@ -823,7 +823,7 @@ sub tables_hash_hack { #'reczone', 'varchar', '', $char_d, 'reczone', 'varchar', '', 255, 'recaf', 'char', '', 2, - 'rectype', 'varchar', '', 5, + 'rectype', 'char', '', 5, #'recdata', 'varchar', '', $char_d, 'recdata', 'varchar', '', 255, ], diff --git a/bin/bind.export b/bin/bind.export index 64d44065d..055782a20 100755 --- a/bin/bind.export +++ b/bin/bind.export @@ -30,10 +30,6 @@ foreach my $export ( @exports ) { my $machine = $export->machine; my $prefix = "$spooldir/$machine"; - my $bind_rel = $export->option('bind_release'); - my $ndc_cmd = ($bind_rel eq 'BIND9') ? 'rndc' : 'ndc'; - my $minttl = $export->option('bind9_minttl'); - #prevent old domain files from piling up #rmtree "$prefix" or die "can't rmtree $prefix.db: $!"; @@ -83,10 +79,6 @@ END open (DB_MASTER,">$prefix/db.$domain") or die "can't open $prefix/db.$domain: $!"; - if ($bind_rel eq 'BIND9') { - print DB_MASTER "\$TTL $minttl\n\$ORIGIN $domain.\n"; - } - my @domain_records = qsearch('domain_record', { 'svcnum' => $svc_domain->svcnum } ); foreach my $domain_record ( @@ -122,7 +114,7 @@ END } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err); # warn $rsync->out; - ssh("root\@$machine", "$ndc_cmd reload"); + ssh("root\@$machine", 'ndc reload'); } @@ -133,9 +125,6 @@ foreach my $sexport ( @sexports ) { #false laziness with above my $machine = $sexport->machine; my $prefix = "$spooldir/$machine"; - my $bind_rel = $sexport->option('bind_release'); - my $ndc_cmd = ($bind_rel eq 'BIND9') ? 'rndc' : 'ndc'; - #prevent old domain files from piling up #rmtree "$prefix" or die "can't rmtree $prefix.db: $!"; @@ -177,7 +166,7 @@ END } ) or die "rsync to $machine failed: ". join(" / ", $rsync->err); # warn $rsync->out; - ssh("root\@$machine", "$ndc_cmd reload"); + ssh("root\@$machine", 'ndc reload'); } close NAMED_CONF; |