From 37198b1930409cffad9336fbc0aaff6fd13afcfe Mon Sep 17 00:00:00 2001 From: Paul Kelly Date: Sun, 31 Oct 2010 19:27:28 +0000 Subject: [PATCH] Prior to renaming netdb to netsvc --- app/views/home/_settings.html.erb | 2 +- db/migrate/20091212110033_create_vendors.rb | 1 + db/migrate/20091212110042_create_servertypes.rb | 1 + db/migrate/20101015100000_add_dns_column.rb | 2 ++ lib/netdb_manager/host_ext.rb | 6 +++++- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/home/_settings.html.erb b/app/views/home/_settings.html.erb index 4faca36..b855ed4 100644 --- a/app/views/home/_settings.html.erb +++ b/app/views/home/_settings.html.erb @@ -21,7 +21,7 @@ ['Usergroups', usergroups_url] ] if SETTINGS[:login] %> -<%= select :controller, :id, choices, {:selected => @controller.request.url}, {:id => "settings_dropdown"}%> +<%= select :obj, :name, choices, {:selected => @controller.request.url} , {:id => "settings_dropdown"}%> <%= observe_field('settings_dropdown', :function => "window.location.href = value;") %> diff --git a/db/migrate/20091212110033_create_vendors.rb b/db/migrate/20091212110033_create_vendors.rb index a9513ac..b2097c2 100644 --- a/db/migrate/20091212110033_create_vendors.rb +++ b/db/migrate/20091212110033_create_vendors.rb @@ -7,6 +7,7 @@ def self.up end Vendor.create :name => "Microsoft" Vendor.create :name => "ISC" + Vendor.create :name => "Generic" end def self.down diff --git a/db/migrate/20091212110042_create_servertypes.rb b/db/migrate/20091212110042_create_servertypes.rb index b0c5e93..a23bbf2 100644 --- a/db/migrate/20091212110042_create_servertypes.rb +++ b/db/migrate/20091212110042_create_servertypes.rb @@ -7,6 +7,7 @@ def self.up end Servertype.create :name => "DHCP" Servertype.create :name => "DNS" + Servertype.create :name => "TFTP" end def self.down diff --git a/db/migrate/20101015100000_add_dns_column.rb b/db/migrate/20101015100000_add_dns_column.rb index f96f887..03cb4bb 100644 --- a/db/migrate/20101015100000_add_dns_column.rb +++ b/db/migrate/20101015100000_add_dns_column.rb @@ -1,9 +1,11 @@ class AddDnsColumn < ActiveRecord::Migration def self.up add_column :domains, :dns_id, :integer + add_column :domains, :tftp_id, :integer end def self.down + remove_column :domains, :tftp_id remove_column :domains, :dns_id end end diff --git a/lib/netdb_manager/host_ext.rb b/lib/netdb_manager/host_ext.rb index 5032613..a67571a 100644 --- a/lib/netdb_manager/host_ext.rb +++ b/lib/netdb_manager/host_ext.rb @@ -22,7 +22,7 @@ def self.included(base) base.class_eval do attr_accessor :dns, :dhcp before_create :initialize_proxies, :check_netdbs - after_create :create_netdbs + after_create :create_netdbs, :initialize_tftp after_update :initialize_proxies, :update_netdbs after_destroy :initialize_proxies, :destroy_netdbs end @@ -30,6 +30,10 @@ def self.included(base) end module InstanceMethods + # Ensure that the tftp bootfiles are available on the proxy host + def initialize_tftp + + end # Checks whether DNS or DHCP entries already exist # Returns: Boolean true if no entries exists def check_netdbs