merging vpopmail support branch

[freeside.git] / bin / fs-setup

diff --git a/bin/fs-setup b/bin/fs-setup
index 314a7c2..a3e067b 100755 (executable)
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.40 2001-08-11 05:53:42 ivan Exp $
+# $Id: fs-setup,v 1.41 2001-08-12 19:41:25 jeff Exp $
 #
 # ivan@sisd.com 97-nov-8,9
 #
@@ -32,7 +32,10 @@
 # fix radius attributes ivan@sisd.com 98-sep-27
 #
 # $Log: fs-setup,v $
-# Revision 1.40  2001-08-11 05:53:42  ivan
+# Revision 1.41  2001-08-12 19:41:25  jeff
+# merging vpopmail support branch
+#
+# Revision 1.40  2001/08/11 05:53:42  ivan
 # add comments field
 #
 # Revision 1.39  2001/07/30 07:42:39  ivan
@@ -271,7 +274,7 @@ my($part_svc)=$dbdef->table('part_svc');
 #because of svc_acct_pop
 #foreach (grep /^svc_/, $dbdef->tables) { 
 #foreach (qw(svc_acct svc_acct_sm svc_charge svc_domain svc_wo)) {
-foreach (qw(svc_acct svc_acct_sm svc_domain svc_www)) {
+foreach (qw(svc_acct svc_acct_sm svc_domain svc_forward svc_www)) {
   my($table)=$dbdef->table($_);
   my($col);
   foreach $col ( $table->columns ) {
@@ -707,10 +710,11 @@ sub tables_hash_hack {
         'quota',     'varchar',   'NULL',   $char_d,
         'slipip',    'varchar',   'NULL',   15, #four TINYINTs, bah.
         'seconds',   'int', 'NULL',   '', #uhhhh
+        'domsvc',    'int', '',   '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ [] ],
-      'index' => [ ['username'] ],
+      'index' => [ ['username'], ['domsvc'] ],
     },
 
     'svc_acct_sm' => {
@@ -739,6 +743,7 @@ sub tables_hash_hack {
       'columns' => [
         'svcnum',    'int',    '',   '',
         'domain',    'varchar',    '',   $char_d,
+        'catchall',  'int',    '',    '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ['domain'] ],
@@ -759,6 +764,18 @@ sub tables_hash_hack {
       'index'       => [ ['svcnum'] ],
     },
 
+    'svc_forward' => {
+      'columns' => [
+        'svcnum',   'int',    '',  '',
+        'srcsvc',   'int',    '',  '',
+        'dstsvc',   'int',    '',  '',
+        'dst',      'varchar',    'NULL',  $char_d,
+      ],
+      'primary_key' => 'svcnum',
+      'unique'      => [ [] ],
+      'index'       => [ ['srcsvc'], ['dstsvc'] ],
+    },
+
     'svc_www' => {
       'columns' => [
         'svcnum',   'int',    '',  '',