--- foreman_0.1.5_tables.sql	Mon Mar 26 13:25:16 2012
+++ foreman_0.4.0_tables.sql	Mon Mar 26 13:26:48 2012
@@ -69,12 +69,16 @@
   `action` varchar(255) default NULL,
   `changes` text,
   `version` int(11) default '0',
+  `comment` varchar(255) default NULL,
+  `auditable_parent_id` int(11) default NULL,
+  `auditable_parent_type` varchar(255) default NULL,
   `created_at` datetime default NULL,
   PRIMARY KEY  (`id`),
   KEY `auditable_index` (`auditable_id`,`auditable_type`),
   KEY `user_index` (`user_id`,`user_type`),
-  KEY `index_audits_on_created_at` (`created_at`)
-) ENGINE=InnoDB AUTO_INCREMENT=639 DEFAULT CHARSET=latin1;
+  KEY `index_audits_on_created_at` (`created_at`),
+  KEY `auditable_parent_index` (`auditable_parent_id`,`auditable_parent_type`)
+) ENGINE=InnoDB AUTO_INCREMENT=644 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -102,7 +106,61 @@
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `bookmarks`
+--
+
+DROP TABLE IF EXISTS `bookmarks`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `bookmarks` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255) default NULL,
+  `query` varchar(255) default NULL,
+  `controller` varchar(255) default NULL,
+  `public` tinyint(1) default NULL,
+  `owner_id` int(11) default NULL,
+  `owner_type` varchar(255) default NULL,
+  PRIMARY KEY  (`id`),
+  KEY `index_bookmarks_on_name` (`name`),
+  KEY `index_bookmarks_on_controller` (`controller`),
+  KEY `index_bookmarks_on_owner_id_and_owner_type` (`owner_id`,`owner_type`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `config_templates`
+--
+
+DROP TABLE IF EXISTS `config_templates`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `config_templates` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255) default NULL,
+  `template` text,
+  `snippet` tinyint(1) default NULL,
+  `template_kind_id` int(11) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `config_templates_operatingsystems`
+--
+
+DROP TABLE IF EXISTS `config_templates_operatingsystems`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `config_templates_operatingsystems` (
+  `config_template_id` int(11) NOT NULL,
+  `operatingsystem_id` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -115,13 +173,12 @@
 CREATE TABLE `domains` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(255) NOT NULL default '',
-  `dnsserver` varchar(255) default NULL,
-  `gateway` varchar(40) default NULL,
   `fullname` varchar(32) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
+  `dns_id` int(11) default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -137,7 +194,7 @@
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -167,7 +224,7 @@
   `created_at` datetime default NULL,
   PRIMARY KEY  (`id`),
   KEY `index_fact_names_on_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=488 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=115 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -179,7 +236,7 @@
 SET character_set_client = utf8;
 CREATE TABLE `fact_values` (
   `id` int(11) NOT NULL auto_increment,
-  `value` varchar(255) character set utf8 collate utf8_bin NOT NULL,
+  `value` text character set utf8 collate utf8_bin NOT NULL,
   `fact_name_id` int(11) NOT NULL,
   `host_id` int(11) NOT NULL,
   `updated_at` datetime default NULL,
@@ -187,7 +244,51 @@
   PRIMARY KEY  (`id`),
   KEY `index_fact_values_on_fact_name_id` (`fact_name_id`),
   KEY `index_fact_values_on_host_id` (`host_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=37761727 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=2958423 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `features`
+--
+
+DROP TABLE IF EXISTS `features`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `features` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(16) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `features_smart_proxies`
+--
+
+DROP TABLE IF EXISTS `features_smart_proxies`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `features_smart_proxies` (
+  `smart_proxy_id` int(11) default NULL,
+  `feature_id` int(11) default NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `host_classes`
+--
+
+DROP TABLE IF EXISTS `host_classes`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `host_classes` (
+  `puppetclass_id` int(11) NOT NULL,
+  `host_id` int(11) NOT NULL,
+  `id` int(11) NOT NULL auto_increment,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -202,8 +303,23 @@
   `name` varchar(255) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
+  `environment_id` int(11) default NULL,
+  `operatingsystem_id` int(11) default NULL,
+  `architecture_id` int(11) default NULL,
+  `medium_id` int(11) default NULL,
+  `ptable_id` int(11) default NULL,
+  `root_pass` varchar(255) default NULL,
+  `puppetmaster_name` varchar(255) default NULL,
+  `puppetproxy_id` int(11) default NULL,
+  `use_image` tinyint(1) default NULL,
+  `image_file` varchar(128) default NULL,
+  `ancestry` varchar(255) default NULL,
+  `vm_defaults` text,
+  `subnet_id` int(11) default NULL,
+  `domain_id` int(11) default NULL,
+  PRIMARY KEY  (`id`),
+  KEY `index_hostgroups_on_ancestry` (`ancestry`)
+) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -230,7 +346,7 @@
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(255) NOT NULL,
   `ip` varchar(255) default NULL,
-  `environment` varchar(255) default NULL,
+  `environment` text,
   `last_compile` datetime default NULL,
   `last_freshcheck` datetime default NULL,
   `last_report` datetime default NULL,
@@ -243,7 +359,7 @@
   `sp_name` varchar(255) default '',
   `root_pass` varchar(64) default NULL,
   `serial` varchar(12) default NULL,
-  `puppetmaster` varchar(255) default NULL,
+  `puppetmaster_name` varchar(255) default NULL,
   `puppet_status` int(11) NOT NULL default '0',
   `domain_id` int(11) default NULL,
   `architecture_id` int(11) default NULL,
@@ -252,7 +368,7 @@
   `subnet_id` int(11) default NULL,
   `sp_subnet_id` int(11) default NULL,
   `ptable_id` int(11) default NULL,
-  `media_id` int(11) default NULL,
+  `medium_id` int(11) default NULL,
   `build` tinyint(1) default '0',
   `comment` text,
   `disk` text,
@@ -261,6 +377,11 @@
   `hostgroup_id` int(11) default NULL,
   `owner_id` int(11) default NULL,
   `owner_type` varchar(255) default NULL,
+  `enabled` tinyint(1) default '1',
+  `puppetproxy_id` int(11) default NULL,
+  `managed` tinyint(1) default NULL,
+  `use_image` tinyint(1) default NULL,
+  `image_file` varchar(128) default NULL,
   PRIMARY KEY  (`id`),
   KEY `index_hosts_on_source_file_id` (`source_file_id`),
   KEY `index_hosts_on_name` (`name`),
@@ -271,25 +392,86 @@
   KEY `host_arch_id_ix` (`architecture_id`),
   KEY `host_os_id_ix` (`operatingsystem_id`),
   KEY `host_env_id_ix` (`environment_id`),
-  KEY `host_media_id_ix` (`media_id`),
+  KEY `host_medium_id_ix` (`medium_id`),
   KEY `host_group_id_ix` (`hostgroup_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=169 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=68 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
--- Table structure for table `hosts_puppetclasses`
+-- Table structure for table `hypervisors`
 --
 
-DROP TABLE IF EXISTS `hosts_puppetclasses`;
+DROP TABLE IF EXISTS `hypervisors`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-CREATE TABLE `hosts_puppetclasses` (
-  `puppetclass_id` int(11) NOT NULL,
-  `host_id` int(11) NOT NULL
+CREATE TABLE `hypervisors` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255) default NULL,
+  `uri` varchar(255) default NULL,
+  `kind` varchar(255) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `inventory_facts`
+--
+
+DROP TABLE IF EXISTS `inventory_facts`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `inventory_facts` (
+  `node_id` int(11) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `value` text NOT NULL,
+  `created_at` datetime default NULL,
+  UNIQUE KEY `index_inventory_facts_on_node_id_and_name` (`node_id`,`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `inventory_nodes`
+--
+
+DROP TABLE IF EXISTS `inventory_nodes`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `inventory_nodes` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255) NOT NULL,
+  `timestamp` datetime NOT NULL,
+  `updated_at` datetime default NULL,
+  `created_at` datetime default NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `index_inventory_nodes_on_name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
+-- Table structure for table `logs`
+--
+
+DROP TABLE IF EXISTS `logs`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `logs` (
+  `id` int(11) NOT NULL auto_increment,
+  `source_id` int(11) default NULL,
+  `message_id` int(11) default NULL,
+  `report_id` int(11) default NULL,
+  `level_id` int(11) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`),
+  KEY `index_logs_on_report_id` (`report_id`),
+  KEY `index_logs_on_message_id` (`message_id`),
+  KEY `index_logs_on_level_id` (`level_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=121114 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
 -- Table structure for table `lookup_keys`
 --
 
@@ -301,8 +483,16 @@
   `key` varchar(255) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
+  `puppetclass_id` int(11) default NULL,
+  `default_value` varchar(255) default NULL,
+  `path` varchar(255) default NULL,
+  `description` varchar(255) default NULL,
+  `validator_type` varchar(255) default NULL,
+  `validator_rule` varchar(255) default NULL,
   PRIMARY KEY  (`id`),
-  KEY `index_lookup_keys_on_key` (`key`)
+  KEY `index_lookup_keys_on_key` (`key`),
+  KEY `index_lookup_keys_on_puppetclass_id` (`puppetclass_id`),
+  KEY `index_lookup_keys_on_path` (`path`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -315,47 +505,66 @@
 SET character_set_client = utf8;
 CREATE TABLE `lookup_values` (
   `id` int(11) NOT NULL auto_increment,
-  `priority` varchar(255) default NULL,
+  `match` varchar(255) default NULL,
   `value` varchar(255) default NULL,
   `lookup_key_id` int(11) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
   PRIMARY KEY  (`id`),
-  KEY `index_lookup_values_on_priority` (`priority`)
+  KEY `index_lookup_values_on_priority` (`match`),
+  KEY `index_lookup_values_on_match` (`match`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
--- Table structure for table `medias`
+-- Table structure for table `media`
 --
 
-DROP TABLE IF EXISTS `medias`;
+DROP TABLE IF EXISTS `media`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-CREATE TABLE `medias` (
+CREATE TABLE `media` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(50) NOT NULL default '',
   `path` varchar(100) NOT NULL default '',
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
+  `media_path` varchar(128) default NULL,
+  `config_path` varchar(128) default NULL,
+  `image_path` varchar(128) default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
--- Table structure for table `medias_operatingsystems`
+-- Table structure for table `media_operatingsystems`
 --
 
-DROP TABLE IF EXISTS `medias_operatingsystems`;
+DROP TABLE IF EXISTS `media_operatingsystems`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
-CREATE TABLE `medias_operatingsystems` (
-  `media_id` int(11) NOT NULL,
+CREATE TABLE `media_operatingsystems` (
+  `medium_id` int(11) NOT NULL,
   `operatingsystem_id` int(11) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
+-- Table structure for table `messages`
+--
+
+DROP TABLE IF EXISTS `messages`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `messages` (
+  `id` int(11) NOT NULL auto_increment,
+  `value` text,
+  PRIMARY KEY  (`id`),
+  FULLTEXT KEY `value` (`value`)
+) ENGINE=MyISAM AUTO_INCREMENT=2705 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
 -- Table structure for table `models`
 --
 
@@ -368,8 +577,28 @@
   `info` text,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
+  `vendor_class` varchar(32) default NULL,
+  `hardware_model` varchar(16) default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `notices`
+--
+
+DROP TABLE IF EXISTS `notices`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `notices` (
+  `id` int(11) NOT NULL auto_increment,
+  `content` varchar(1024) NOT NULL,
+  `global` tinyint(1) NOT NULL default '1',
+  `level` varchar(255) NOT NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -387,10 +616,11 @@
   `nameindicator` varchar(3) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
-  `family_id` int(11) default NULL,
   `release_name` varchar(64) default NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
+  `type` varchar(16) default NULL,
+  PRIMARY KEY  (`id`),
+  KEY `index_operatingsystems_on_type` (`type`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -420,6 +650,24 @@
 SET character_set_client = @saved_cs_client;
 
 --
+-- Table structure for table `os_default_templates`
+--
+
+DROP TABLE IF EXISTS `os_default_templates`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `os_default_templates` (
+  `id` int(11) NOT NULL auto_increment,
+  `config_template_id` int(11) default NULL,
+  `template_kind_id` int(11) default NULL,
+  `operatingsystem_id` int(11) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
 -- Table structure for table `param_names`
 --
 
@@ -433,7 +681,7 @@
   `created_at` datetime default NULL,
   PRIMARY KEY  (`id`),
   KEY `index_param_names_on_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=55 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -454,7 +702,7 @@
   PRIMARY KEY  (`id`),
   KEY `index_param_values_on_param_name_id` (`param_name_id`),
   KEY `index_param_values_on_resource_id` (`resource_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=753079 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=64313 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -468,18 +716,15 @@
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(255) default NULL,
   `value` varchar(255) default NULL,
-  `host_id` int(11) default NULL,
+  `reference_id` int(11) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
-  `hostgroup_id` int(11) default NULL,
   `type` varchar(255) default NULL,
-  `domain_id` int(11) default NULL,
+  `priority` int(11) default NULL,
   PRIMARY KEY  (`id`),
-  KEY `index_parameters_on_host_id_and_type` (`host_id`,`type`),
-  KEY `index_parameters_on_hostgroup_id_and_type` (`hostgroup_id`,`type`),
-  KEY `index_parameters_on_domain_id_and_type` (`domain_id`,`type`),
-  KEY `index_parameters_on_type` (`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1;
+  KEY `index_parameters_on_type` (`type`),
+  KEY `index_parameters_on_reference_id_and_type` (`reference_id`,`type`)
+) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -497,7 +742,7 @@
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -514,7 +759,7 @@
   `created_at` datetime default NULL,
   PRIMARY KEY  (`id`),
   KEY `index_puppet_tags_on_id` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=653 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=192 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -527,12 +772,10 @@
 CREATE TABLE `puppetclasses` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(255) default NULL,
-  `nameindicator` varchar(255) default NULL,
-  `operatingsystem_id` int(11) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=81 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -545,17 +788,17 @@
 CREATE TABLE `reports` (
   `id` int(11) NOT NULL auto_increment,
   `host_id` int(11) NOT NULL,
-  `log` mediumtext,
   `reported_at` datetime default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
   `status` int(11) default NULL,
+  `metrics` text,
   PRIMARY KEY  (`id`),
   KEY `index_reports_on_reported_at_and_host_id` (`reported_at`,`host_id`),
   KEY `index_reports_on_status` (`status`),
   KEY `index_reports_on_host_id` (`host_id`),
   KEY `index_reports_on_reported_at` (`reported_at`)
-) ENGINE=InnoDB AUTO_INCREMENT=410903 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=42500 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -574,7 +817,7 @@
   PRIMARY KEY  (`id`),
   KEY `index_resource_tags_on_resource_id` (`resource_id`),
   KEY `index_resource_tags_on_puppet_tag_id` (`puppet_tag_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1330247 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=20192 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -598,7 +841,23 @@
   KEY `index_resources_on_host_id` (`host_id`),
   KEY `index_resources_on_source_file_id` (`source_file_id`),
   KEY `typentitle` (`restype`,`title`(50))
-) ENGINE=InnoDB AUTO_INCREMENT=125828 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=2807 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `roles`
+--
+
+DROP TABLE IF EXISTS `roles`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `roles` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(30) default NULL,
+  `builtin` int(11) default NULL,
+  `permissions` text,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -610,6 +869,7 @@
 SET character_set_client = utf8;
 CREATE TABLE `schema_migrations` (
   `version` varchar(255) NOT NULL,
+  `created_at` datetime default NULL,
   UNIQUE KEY `unique_schema_migrations` (`version`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
@@ -630,7 +890,46 @@
   PRIMARY KEY  (`id`),
   KEY `index_sessions_on_session_id` (`session_id`),
   KEY `index_sessions_on_updated_at` (`updated_at`)
-) ENGINE=InnoDB AUTO_INCREMENT=823384 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `settings`
+--
+
+DROP TABLE IF EXISTS `settings`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `settings` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255) default NULL,
+  `value` text,
+  `description` text,
+  `category` varchar(255) default NULL,
+  `settings_type` varchar(255) default NULL,
+  `default` text NOT NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `index_settings_on_name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `smart_proxies`
+--
+
+DROP TABLE IF EXISTS `smart_proxies`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `smart_proxies` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255) default NULL,
+  `url` varchar(255) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -648,7 +947,22 @@
   `created_at` datetime default NULL,
   PRIMARY KEY  (`id`),
   KEY `index_source_files_on_filename` (`filename`)
-) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `sources`
+--
+
+DROP TABLE IF EXISTS `sources`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `sources` (
+  `id` int(11) NOT NULL auto_increment,
+  `value` text,
+  PRIMARY KEY  (`id`),
+  FULLTEXT KEY `value` (`value`)
+) ENGINE=MyISAM AUTO_INCREMENT=607 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
@@ -660,7 +974,7 @@
 SET character_set_client = utf8;
 CREATE TABLE `subnets` (
   `id` int(11) NOT NULL auto_increment,
-  `number` varchar(15) default NULL,
+  `network` varchar(15) default NULL,
   `mask` varchar(15) default NULL,
   `domain_id` int(11) default NULL,
   `priority` int(11) default NULL,
@@ -669,11 +983,121 @@
   `vlanid` varchar(10) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
+  `dhcp_id` int(11) default NULL,
+  `tftp_id` int(11) default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `template_combinations`
+--
+
+DROP TABLE IF EXISTS `template_combinations`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `template_combinations` (
+  `id` int(11) NOT NULL auto_increment,
+  `config_template_id` int(11) default NULL,
+  `hostgroup_id` int(11) default NULL,
+  `environment_id` int(11) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
 --
+-- Table structure for table `template_kinds`
+--
+
+DROP TABLE IF EXISTS `template_kinds`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `template_kinds` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(255) default NULL,
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `user_domains`
+--
+
+DROP TABLE IF EXISTS `user_domains`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `user_domains` (
+  `user_id` int(11) default NULL,
+  `domain_id` int(11) default NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `user_facts`
+--
+
+DROP TABLE IF EXISTS `user_facts`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `user_facts` (
+  `id` int(11) NOT NULL auto_increment,
+  `user_id` int(11) default NULL,
+  `fact_name_id` int(11) default NULL,
+  `criteria` varchar(255) default NULL,
+  `operator` varchar(3) default '=',
+  `andor` varchar(3) default 'or',
+  `created_at` datetime default NULL,
+  `updated_at` datetime default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `user_hostgroups`
+--
+
+DROP TABLE IF EXISTS `user_hostgroups`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `user_hostgroups` (
+  `user_id` int(11) default NULL,
+  `hostgroup_id` int(11) default NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `user_notices`
+--
+
+DROP TABLE IF EXISTS `user_notices`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `user_notices` (
+  `user_id` int(11) default NULL,
+  `notice_id` int(11) default NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Table structure for table `user_roles`
+--
+
+DROP TABLE IF EXISTS `user_roles`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `user_roles` (
+  `id` int(11) NOT NULL auto_increment,
+  `user_id` int(11) default NULL,
+  `role_id` int(11) default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
 -- Table structure for table `usergroup_members`
 --
 
@@ -723,8 +1147,15 @@
   `auth_source_id` int(11) default NULL,
   `created_at` datetime default NULL,
   `updated_at` datetime default NULL,
+  `password_hash` varchar(128) default NULL,
+  `password_salt` varchar(128) default NULL,
+  `role_id` int(11) default NULL,
+  `domains_andor` varchar(3) default 'or',
+  `hostgroups_andor` varchar(3) default 'or',
+  `facts_andor` varchar(3) default 'or',
+  `filter_on_owner` tinyint(1) default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
@@ -736,4 +1167,4 @@
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2012-03-05 10:37:08
+-- Dump completed on 2012-03-26 12:16:38