New table, default_firewall_vars, for firewall variables.

Also, reflect new way of populating default_firewall_rules
(not done here anymore, done in the new firewall subdirectory)

sql/GNUmakefile

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2004 University of Utah and the Flux Group.
+# Copyright (c) 2000-2005 University of Utah and the Flux Group.
 # All rights reserved.
 #
 #
@@ -14,7 +14,7 @@
 # The easy way: do 'gmake all'
 # You can also run the individual targets too.
 
-all: db-create db-fill sitevars fwrules
+all: db-create db-fill sitevars
 
 db-create:
 	@rm -f ./.tmp-db-create.sql ./.tmp-create-diff
@@ -40,7 +40,6 @@ sitevars:
 	@mysqldump -t tbdb sitevariables > sitevars-create.sql 
 
 fwrules:
-	@echo "DELETE FROM default_firewall_rules;" > fwrules-create.sql
-	@mysqldump -t tbdb default_firewall_rules >> fwrules-create.sql
+	@echo "*** Use 'gmake insertrules' in the firewall subdir to do this"
 
 dist:	db-fill-dist

sql/database-create.sql

@@ -64,6 +64,16 @@ CREATE TABLE default_firewall_rules (
   PRIMARY KEY  (type,style,ruleno)
 ) TYPE=MyISAM;
 
+--
+-- Table structure for table `default_firewall_vars`
+--
+
+CREATE TABLE default_firewall_vars (
+  name varchar(255) NOT NULL default '',
+  value text,
+  PRIMARY KEY  (name)
+) TYPE=MyISAM;
+
 --
 -- Table structure for table `delays`
 --

sql/database-migrate.txt

@@ -2289,3 +2289,25 @@ last_net_act,last_cpu_act,last_ext_act);
           description tinytext,
           PRIMARY KEY  (obstacle_id)
          ) TYPE=MyISAM;
+
+1.299: Add default_firewall_vars table.  These are global (not
+       per-experiment!) variables that get expanded on the client-side
+       before using them.  Intended to keep the default rules
+       site-independent.
+
+	CREATE TABLE default_firewall_vars (
+	  name varchar(255) NOT NULL default '',
+	  value text,
+	  PRIMARY KEY  (name)
+	) TYPE=MyISAM;
+
+       Populate the vars table at you site by:
+
+	cd <your_build_tree>/firewall
+	gmake insertvars
+
+       Update the default_firewall_rules with (NOTE: this will clobber
+       any rules you have added to default_firewall_rules!):
+
+	cd <your_build_tree>/firewall
+	gmake insertrules