spiderfw 0.6.5 → 0.6.6

data/CHANGELOG

@@ -1,3 +1,13 @@
+= 0.6.6
+== 19 July, 2011
+* Fix: use SEE_OTHER as default redirect code to avoid FF 5 caching
+* Fix: follow symlinks in base paths
+* Fix: reworked resource paths, views inclusion and extension now more reliable
+* Tree mixin now has tree_position, ordering
+* DB dumping
+* Better process management
+* Added bin/spider to default home
+
 = 0.6.5
 == 29 June, 2011
 * Mapper fixes

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/apps/app_server/config/options.rb

@@ -2,5 +2,5 @@ Spider.config_option 'app_server.url', _("Url of the app server"), :default => '
 Spider.config_option 'app_server.search_paths', _("Paths to search for apps"), :type => Array
 Spider.config_option 'app_server.git_ssh', _("Name of the ssh server")
 Spider.config_option 'app_server.git_http', _("Http git prefix for each git path"), :type => Hash
-
-
+Spider.config_option 'app_server.git_repo_base', _("Base path for read-only git repository access")
+Spider.config_option 'app_server.git_repo_rw_base', _("Base path for read-write git repository access")

data/apps/core/components/assets.rb

@@ -62,13 +62,9 @@ Spider::Template.define_named_asset 'jquery-ui-selectable', [
 ], :depends => ['jquery-ui-core']
 
 Spider::Template.define_named_asset 'jquery-ui-sortable', [
-    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.sortable.js', Spider::Components],
+    [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.sortable.js', Spider::Components]
 ], :depends => ['jquery-ui-core']
 
-Spider::Template.define_named_asset 'jquery-ui-nestedSortable', [
-    [:js, 'js/jquery/plugins/jquery.ui.nestedSortable.js', Spider::Components],
-], :depends => ['jquery-ui-sortable']
-
 Spider::Template.define_named_asset 'jquery-ui-accordion', [
     [:js, 'js/jquery/jquery-ui-1.8.11/ui/jquery.ui.accordion.js', Spider::Components]
 ], :depends => ['jquery-ui-core']

data/apps/core/components/widgets/month_calendar/month_calendar.shtml

@@ -4,9 +4,9 @@
         <thead>
             <tr>
                 <th colspan="7">
-                    <a href="{ @request[:path] }?_w{ @widget[:param] }%5Bd%5D={ @prev_link }"><span>&lt;&lt;</span></a>
+                    <a href="{ @request[:path] }?_w{ @widget[:param_u] }%5Bd%5D={ @prev_link }"><span>&lt;&lt;</span></a>
                     { @current_month_name } { @year }
-                    <a href="{ @request[:path] }?_w{ @widget[:param] }%5Bd%5D={ @next_link }"><span>&gt;&gt;</span></a>
+                    <a href="{ @request[:path] }?_w{ @widget[:param_u] }%5Bd%5D={ @next_link }"><span>&gt;&gt;</span></a>
                 </th>
             </tr>
             <tr>
@@ -21,4 +21,4 @@
             </tr>
         </tbody>
     </table>
-</div>
+</div>

data/apps/core/components/widgets/table/table.rb

@@ -90,6 +90,7 @@ module Spider; module Components
             @model.elements_array.each{ |el| @scene.sortable[el.name] = @model.mapper.sortable?(el) ? true : false }
             @scene.labels = {}
             @elements.each do |el|
+                raise "No element #{el} in #{@model} for table #{@id}" unless @model.elements[el]
                 @scene.labels[el] = @model.elements[el].label
             end
             @rows = prepare_queryset(@queryset ? @queryset : @model.list)
@@ -138,6 +139,7 @@ module Spider; module Components
                                     sub = sub.get(element.attributes[:junction_their_element]) 
                                 end
                                 sub_desc = sub.nil? ? '' : sub.to_s
+                                sub_desc ||= ''
                                 sub_desc = sub_desc[0..@attributes[:max_element_length]] if sub_desc.length > @attributes[:max_element_length]
                                 list += "<li>"+sub_desc+"</li>" unless sub_desc.empty?
                             }

data/apps/core/components/widgets/tabs/tabs.rb

@@ -16,13 +16,16 @@ module Spider; module Components
         end
         
         def prepare
-            super
+            @active_tab = params['tab']
+            @active_tab ||= transient_session[:tab]
             @active_tab ||= @tabs.first
+            transient_session[:tab] = @active_tab
             @scene << {
                 :active_tab => @active_tab,
                 :tabs => @tabs,
                 :tabs_labels => @tabs_labels
             }
+            super
         end
         
         def self.parse_content(doc)
@@ -32,7 +35,7 @@ module Spider; module Components
             tabs_override = '<tpl:override search="#tabs_content">'
             doc.search('tab').each do |tab|
                 tab_id = tab.get_attribute('id')
-                tabs_override += '<div sp:if="@active_tab == \''+tab_id+'\'>'
+                tabs_override += '<div sp:if="@active_tab == \''+tab_id+'\'">'
                 tabs_override += '<sp:parent-context>'
                 tabs_override += tab.innerHTML
                 tabs_override += '</sp:parent-context>'
@@ -40,7 +43,7 @@ module Spider; module Components
                 tab.innerHTML = ''
             end
             tabs_override += '</tpl:override>'
-            overrides << Hpricot(tabs_override).root
+            overrides << Hpricot.XML(tabs_override).root
             return doc.to_s, overrides
         end
         
@@ -50,6 +53,9 @@ module Spider; module Components
             doc.search('tab').each do |tab|
                 tab_id = tab.get_attribute('id')
                 label = tab.get_attribute('label')
+                if label =~ /_\((.+)\)/
+                    label = _($1)
+                end
                 add_tab(tab_id, label)
             end
             return doc

data/apps/core/components/widgets/tabs/tabs.shtml

@@ -1,7 +1,7 @@
 <div class="tabs">
     <ul>
         <li sp:each="@tabs |tab_id|">
-            <a href="#aaa">{ @tabs_labels[tab_id] }</a>
+            <a href="?{ widget_param_u('tab') }={ tab_id }">{ @tabs_labels[tab_id] }</a>
         </li>
     </ul>
     <div id="tabs_content"></div>

data/apps/master/_init.rb

@@ -13,7 +13,9 @@ require 'apps/master/master'
 
 require 'apps/master/models/admin'
 require 'apps/master/models/customer'
-require 'apps/master/models/servant'
+require 'apps/master/models/installation'
+require 'apps/master/models/remote_log'
+require 'apps/master/models/server'
 require 'apps/master/models/scout_plugin_info'
 require 'apps/master/models/scout_plugin_instance'
 require 'apps/master/models/scout_report'

data/apps/master/cmd.rb

@@ -27,7 +27,7 @@ module Spider; module Master
                 if @instance_id
                     instances = [@instance_id]
                 elsif @server_id
-                    instances = ScoutPluginInstance.where{ |i| (i.servant == @server_id) }.map{ |i| i.id }
+                    instances = ScoutPluginInstance.where{ |i| (i.server == @server_id) }.map{ |i| i.id }
                 # else
                 #     instances = ScoutPluginInstance.all.map{ |i| i.id }
                 end

data/apps/master/controllers/master_controller.rb

@@ -1,5 +1,6 @@
-require 'apps/master/controllers/servant_controller'
+require 'apps/master/controllers/server_controller'
 require 'apps/master/controllers/login_controller'
+require 'json'
 
 
 module Spider; module Master
@@ -11,13 +12,13 @@ module Spider; module Master
         layout 'master'
         
         route /customers\/(\d+)\/installations\//, :installations
-        route /customers\/(\d+)\/servants\//, :servants
-        route /servants\/(\d+)\/plugins\/(\d+)(?:\/(\w+))?(?:\/(.+))?/, :plugin_instance
-        route /servants\/(\d+)\/sites\/(\d+|new|create)(?:\/(\w+))?(?:\/(.+))?/, :site
-        #route /servants\/([^\/]+)/, ServantController, :do => lambda{ |id| @request.misc[:servant] = Servant.new(id) }
+        route /customers\/(\d+)\/servers\//, :servers
+        route /servers\/(\d+)\/plugins\/(\d+)(?:\/(\w+))?(?:\/(.+))?/, :plugin_instance
+        route /servers\/(\d+)\/sites\/(\d+|new|create)(?:\/(\w+))?(?:\/(.+))?/, :site
+        #route /servers\/([^\/]+)/, ServerController, :do => lambda{ |id| @request.misc[:server] = Server.new(id) }
         route 'login', LoginController
         
-        require_user Master::Admin, :unless => [:login, :admin], :redirect => 'login'
+        require_user Master::Admin, :unless => [:login, :admin, :ping], :redirect => 'login'
         require_user Spider::Auth::SuperUser, :only => [:admin]
         
         
@@ -34,6 +35,8 @@ module Spider; module Master
             customers = @user.customers
             if customers.length == 1
                 redirect "customers/#{customers[0].id}"
+            else
+                redirect "customers"
             end
         end
     
@@ -51,21 +54,21 @@ module Spider; module Master
             trigger = @trigger
             instance = @instance
             instance ||= trigger.instance if trigger
-            servant = @servant
-            servant ||= instance.servant if instance
+            server = @server
+            server ||= instance.server if instance
             customer = @customer
-            customer ||= servant.customer if servant
+            customer ||= server.customer if server
             @navigation << { :url => "#{Master.url}/customers/#{customer.id}", :name => customer.name } if customer
-            @navigation << { :url => "#{Master.url}/customers/#{customer.id}/servants/#{servant.id}", :name => servant.name } if servant
-            @navigation << { :url => "#{Master.url}/servants/#{servant.id}/plugins/#{instance.id}", :name => instance.name } if instance
+            @navigation << { :url => "#{Master.url}/customers/#{customer.id}/server/#{server.id}", :name => server.name } if server
+            @navigation << { :url => "#{Master.url}/servers/#{server.id}/plugins/#{instance.id}", :name => instance.name } if instance
             @navigation << { 
-                :url => "#{Master.url}/servants/#{servant.id}/plugins/#{instance.id}/triggers/#{trigger.id}", 
+                :url => "#{Master.url}/servers/#{server.id}/plugins/#{instance.id}/triggers/#{trigger.id}", 
                 :name => "#{_('Trigger')} #{trigger.label}"
             } if trigger
             @scene << {
                 :trigger => trigger,
                 :instance => instance,
-                :servant => servant,
+                :server => server,
                 :customer => customer
             }
             super
@@ -75,7 +78,7 @@ module Spider; module Master
             customer = nil
             if obj.is_a?(Customer)
                 customer = obj
-            elsif obj.is_a?(Servant)
+            elsif obj.is_a?(Server)
                 customer = obj.customer
             end
             raise Spider::Auth::Unauthorized.new(_("No customer")) if !customer && !@user.global?
@@ -109,86 +112,96 @@ module Spider; module Master
         
         
         __.html :template => 'installation'
-        def installations(id, customer_id)
-            @customer = load_customer(customer_id)
-            @installation = Installation.new(id) unless id == 'new'
-            if id == 'new'
-                if @request.params.key?('installation_create') && !@request.params['installation_name'].empty?
-                    i = Installation.new(:name => @request.params['installation_name'])
-                    i.customer = @customer
-                    i.save
-                    redirect(File.dirname(@request.path)+"/#{i.id}")
-                end
-            else
-                if @request.params.key?('save_apps')
-                    @installation.apps = @request.params['apps'].keys.join(',')
-                    @installation.save
-                    redirect(request.path)
-                end
-                @scene.install_apps = (@installation.apps && !@installation.apps.empty?)  ? @installation.apps.split(',') : []
-                @scene.apps = Spider::AppServer.apps
+        def installs(id=nil, customer_id=nil)
+            @customer = load_customer(customer_id) if customer_id
+            if id
+                @installation = Installation.new(id) unless id == 'new'
+                @scene.edit = (@request.params['_w'] && @request.params['_w'].key?('installation_form')) || @request.params.key?('edit') || id == 'new'
+                @scene.pk = id
+            
+                # if id == 'new'
+                #     if @request.params.key?('installation_create') && !@request.params['installation_name'].empty?
+                #         i = Installation.new(:name => @request.params['installation_name'])
+                #         i.customer = @customer
+                #         i.save
+                #         redirect(File.dirname(@request.path)+"/#{i.id}")
+                #     end
+                # else
+                #     if @request.params.key?('save_apps')
+                #         @installation.apps = @request.params['apps'].keys.join(',')
+                #         @installation.save
+                #         redirect(request.path)
+                #     end
+                #     @scene.install_apps = JSON.parse(@installation.apps) unless @installation.apps.blank?
+                #     @scene.install_apps ||= []
+                #     @scene.apps = Spider::AppServer.apps_by_id
+                # end
+                @scene.install_apps = JSON.parse(@installation.apps) unless @installation.apps.blank?
+                @scene.install_apps ||= []
+                @scene.apps = Spider::AppServer.apps_by_id
+                @scene.logs = RemoteLog.where(:installation => @installation)
+                @scene << {
+                    :customer => @customer,
+                    :installation => @installation
+                }
             end
-            @scene << {
-                :customer => @customer,
-                :installation => @installation
-            }
         end
         
         __.html
-        def servants(id=nil, customer_id=nil)
+        def servers(id=nil, customer_id=nil)
             customer_id ||= @request.params['customer']
             customer_id ||= @user.customers[0] unless @user.global?
             available_plugins = Master.scout_plugins.map{ |p| ScoutPlugin.new(p) }
             @scene.available_plugins = available_plugins
             if id
-                visual_params[:template] = 'servant'
-                @servant = Servant.new(id) if id && id != 'new'
-                check_access(@servant) if @servant
-                @scene.edit = (@request.params['_w'] && @request.params['_w'].key?('servant_form')) || @request.params.key?('edit') || id == 'new'
+                visual_params[:template] = 'server'
+                @server = Server.new(id) if id && id != 'new'
+                check_access(@server) if @server
+                @scene.edit = (@request.params['_w'] && @request.params['_w'].key?('server_form')) || @request.params.key?('edit') || id == 'new'
                 @scene.pk = id
                 get_template
-                if id == 'new' && @template.widgets[:servant_form]
-                    @template.widgets[:servant_form].attributes[:auto_redirect] = Master.url+'/servants'
+                if id == 'new' && @template.widgets[:server_form]
+                    @template.widgets[:server_form].attributes[:auto_redirect] = Master.url+'/servers'
                 else
                     if @request.params['submit_add_plugin']
                         plugin = ScoutPlugin.new(@request.params['plugin'])
-                        current = ScoutPluginInstance.where(:servant => @servant, :plugin_id => plugin.id).total_rows
+                        current = ScoutPluginInstance.where(:server => @server, :plugin_id => plugin.id).total_rows
                         name = plugin.name
                         name += " #{current + 1}" if current > 0
-                        instance = ScoutPluginInstance.create(:servant => @servant, :plugin_id => plugin.id, :name => name)
-                        @servant.scout_plan_changed = DateTime.now
-                        @servant.save
+                        instance = ScoutPluginInstance.create(:server => @server, :plugin_id => plugin.id, :name => name)
+                        @server.scout_plan_changed = DateTime.now
+                        @server.save
                         redirect(@request.path)
                     end
                     if @request.params['remove_plugin']
-                        instance = ScoutPluginInstance.load(:id => @request.params['remove_plugin'], :servant => id)
+                        instance = ScoutPluginInstance.load(:id => @request.params['remove_plugin'], :server => id)
                         instance.delete if instance
-                        @servant.scout_plan_changed = DateTime.now
-                        @servant.save
+                        @server.scout_plan_changed = DateTime.now
+                        @server.save
                         redirect(@request.path)
                     end
                 end
                 if customer_id
                     @customer = Customer.new(customer_id) 
-                    if @template.widgets[:servant_form]
-                        @template.widgets[:servant_form].attributes[:auto_redirect] = Master.url+"/customers/#{customer_id}"
-                        @template.widgets[:servant_form].fixed = {:customer => @customer}
+                    if @template.widgets[:server_form]
+                        @template.widgets[:server_form].attributes[:auto_redirect] = Master.url+"/customers/#{customer_id}"
+                        @template.widgets[:server_form].fixed = {:customer => @customer}
                     end
                 end
             else
-                @scene.servants = Servant.all
+                @scene.servers = Server.all
                 if customer_id
-                    @scene.servants.where(:customer => @request.params['customer'])
+                    @scene.servers.where(:customer => @request.params['customer'])
                 end
-                visual_params[:template] = 'servants'
+                visual_params[:template] = 'servers'
             end
         end
         
         __.html
-        def plugin_instance(servant_id, id, action=nil, sub_action=nil)
-            instance = ScoutPluginInstance.load(:id => id, :servant => servant_id)
-            raise NotFound.new("Plugin #{id} for servant #{servant_id}") unless instance
-            @servant = Servant.new(:id => servant_id)
+        def plugin_instance(server_id, id, action=nil, sub_action=nil)
+            instance = ScoutPluginInstance.load(:id => id, :server => server_id)
+            raise NotFound.new("Plugin #{id} for server #{server_id}") unless instance
+            @server = Server.new(:id => server_id)
             @scene.plugin = instance.plugin
             fields = []
             last = instance.last_reported
@@ -215,7 +228,7 @@ module Spider; module Master
                 redirect @request.path
             end 
             if action == "edit"
-                plugin_edit(@servant, @scene.plugin, @instance)
+                plugin_edit(@server, @scene.plugin, @instance)
             elsif action == "triggers"
                 trigger_edit(sub_action)
             elsif action == "data"
@@ -226,10 +239,10 @@ module Spider; module Master
         end
         
         __.html
-        def site(servant_id, id, action=nil, sub_action=nil)
+        def site(server_id, id, action=nil, sub_action=nil)
             if @request.params['submit']
             end
-            @servant = Servant.new(servant_id)
+            @server = Server.new(server_id)
             @scene.site_type = @request.params['site_type']
             if @request.params['edit'] || id == 'new' || id == 'create'
                 render('site_edit')
@@ -239,14 +252,14 @@ module Spider; module Master
         end
         
         __.html
-        def plugin_edit(servant, plugin, instance)
+        def plugin_edit(server, plugin, instance)
             if @request.params['submit']
                 instance.name = @request.params['name']
                 instance.settings = @request.params['settings']
                 instance.poll_interval = @request.params['poll_interval'] unless @request.params['poll_interval'].blank?
                 instance.timeout = @request.params['timeout'] unless @request.params['timeout'].blank?
                 instance.save
-                redirect("#{Master.url}/servants/#{@servant.id}/plugins/#{@instance.id}")
+                redirect("#{Master.url}/server/#{@server.id}/plugins/#{@instance.id}")
             end
             render('plugin_edit')
         end
@@ -259,7 +272,7 @@ module Spider; module Master
                 trigger.data = @request.params['data_series']
             else
                 trigger = ScoutPluginTrigger.load(:id => id, :plugin_instance => @instance)
-                raise NotFound.new("Trigger #{id} of servant #{@scene.servant}") unless trigger
+                raise NotFound.new("Trigger #{id} of server #{@scene.server}") unless trigger
             end
             @trigger = trigger
             if @request.params['submit'] && (id != 'new' || @request.params['data'])
@@ -268,7 +281,7 @@ module Spider; module Master
                     trigger.set(k, v) if trigger.class.elements[k.to_sym]
                 end
                 trigger.save
-                redirect("#{Master.url}/servants/#{@servant.id}/plugins/#{@instance.id}")
+                redirect("#{Master.url}/server/#{@server.id}/plugins/#{@instance.id}")
             end
             render 'trigger_edit'
         end
@@ -311,51 +324,42 @@ module Spider; module Master
             $out << res.to_json
         end
         
-        __.action
+        __.json
         def ping
-            servant_id = @request.params['servant_id']
-            servant = Master::Servant.load(:id => servant_id)
-            new_servant = false
-            unless servant
-                servant = Master::Servant.static(:id => servant_id)
-                new_servant = true
+            install_id = @request.params['install_id']
+            unless install_id
+                Spider.logger.error("No install_id passed in ping")
+                done
             end
-            servant.last_check = DateTime.now
-            servant.name = @request.params['servant_name']
-            servant.system_status = @request.params['system_status']
-            curr_resources = servant.resources_by_type
-            resources = []
-            if @request.params['resources']
-                @request.params['resources'].each do |res_type, type_resources|
-                    type_resources.each do |name, details|
-                        if curr_resources[res_type]
-                            res = curr_resources[res_type][name]
-                        end
-                        res ||= Resource.static
-                        res.resource_type = res_type
-                        res.name = name
-                        res.description = details['description']
-                        res.save
-                        resources << res
-                    end
-                end
-            end
-            servant.resources = resources
-            if new_servant
-                servant.insert
-            else
-                servant.update
+            install = Spider::Master::Installation.load_or_create(:uuid => install_id)
+            install.last_check = DateTime.now
+            install.apps = @request.params['apps']
+            install.interval = @request.params['interval']
+            install.configuration = decompress_string(@request.params['configuration'])
+            install.save
+            log_lines = JSON.parse(@request.params['log'])
+            log_lines.each do |log|
+                time, level, desc = *log
+                time = Time.parse(time)
+                next if log[2] =~ /^Not found/
+                RemoteLog.create(:text => desc, :level => level, :time => time, :installation => install)
             end
             response = {
                 :pong => DateTime.new
             }
-            servant.pending_commands.each do |command|
-                response[:commands] ||= []
-                response[:commands] << command.to_h
-            end
+            # server.pending_commands.each do |command|
+            #     response[:commands] ||= []
+            #     response[:commands] << command.to_h
+            # end
             $out << response.to_json
         end
         
+        private
+        
+        def decompress_string(str)
+            Zlib::GzipReader.new(StringIO.new(str)).read
+        end
+        
     end
     
 end; end

data/apps/master/controllers/scout_controller.rb

@@ -5,16 +5,16 @@ module Spider; module Master
     class ScoutController < Spider::PageController
         
         route /([\w\d]{8}-[\w\d]{4}-[\w\d]{4}-[\w\d]{4}-[\w\d]{12})/, self, :do => lambda{ |uuid|
-            @servant = Servant.load(:uuid => uuid)
+            @server = Server.load(:uuid => uuid)
             @uuid = uuid
-            raise NotFound.new("Servant #{uuid}") unless @servant
+            raise NotFound.new("Server #{uuid}") unless @server
         }
         
 
         __.json
         def plan
-            last_modified = (@servant.scout_plan_changed || @servant.obj_modified).to_local_time
-            @servant.scout_plugins.each do |instance|
+            last_modified = (@server.scout_plan_changed || @server.obj_modified).to_local_time
+            @server.scout_plugins.each do |instance|
                 stat = File.lstat(instance.plugin.rb_path)
                 mtime = stat.mtime
                 last_modified = mtime if mtime > last_modified
@@ -29,7 +29,7 @@ module Spider; module Master
                 raise HTTPStatus.new(Spider::HTTP::NOT_MODIFIED) if last_modified <= if_modified
             end
             @response.headers['Last-Modified'] = last_modified.httpdate
-            $out << @servant.scout_plan.to_json
+            $out << @server.scout_plan.to_json
         end
         
         
@@ -73,7 +73,7 @@ module Spider; module Master
                 next if had_previous
                 subject = alert["fields"]["subject"]
                 instance = ScoutPluginInstance.new(alert["plugin_id"])
-                subject = "#{instance.servant} - #{subject}"
+                subject = "#{instance.server} - #{subject}"
                 alert = ScoutAlert.create(
                     :plugin_instance => alert["plugin_id"],
                     :subject => alert["fields"]["subject"],
@@ -94,7 +94,7 @@ module Spider; module Master
                 end
                 subject = err["fields"]["subject"]
                 instance = ScoutPluginInstance.new(err["plugin_id"])
-                subject = "#{instance.servant} - #{subject}"
+                subject = "#{instance.server} - #{subject}"
                 error = ScoutError.create(
                     :plugin_instance => err["plugin_id"],
                     :subject => err["fields"]["subject"],

data/apps/master/controllers/{servant_controller.rb → server_controller.rb}

@@ -1,11 +1,11 @@
 module Spider; module Master
     
-    class ServantController < Spider::PageController
+    class ServerController < Spider::PageController
         
         __.html
         def index
-            @scene.servant = @request.misc[:servant]
-            render('servant')
+            @scene.server = @request.misc[:server]
+            render('server')
         end
         
         def resources

data/apps/master/master.rb

@@ -14,16 +14,16 @@ module Spider
            res
        end
        
-       def self.url_for_servant(id)
+       def self.url_for_server(id)
            id = id.id if id.is_a?(Spider::Model::BaseModel)
-           servant = Servant.new(id)
-           "#{self.url}/servants/#{servant.id}"
+           server = Server.new(id)
+           "#{self.url}/servers/#{server.id}"
        end
        
        def self.url_for_plugin(id)
            id = id.id if id.is_a?(Spider::Model::BaseModel)
            instance = ScoutPluginInstance.new(id)
-           "#{self.url}/servants/#{instance.servant.id}/plugins/#{id}"
+           "#{self.url}/servers/#{instance.server.id}/plugins/#{id}"
        end
        
        def self.add_site_type(type)

data/apps/master/models/customer.rb

@@ -1,5 +1,3 @@
-require 'apps/master/models/installation'
-
 module Spider; module Master
     
     class Customer < Spider::Model::Managed
@@ -7,7 +5,6 @@ module Spider; module Master
         element :uuid, UUID
         element :public_key, Text
         element :private_key, Text
-        many :installs, Installation, :add_reverse => :customer
         multiple_choice :admins, Master::Admin, :add_multiple_reverse => {:name => :customers, :association => :multiple_choice} do
             element :receive_notifications, Bool, :default => true
             element :manage_plugins, Bool, :default => true

data/apps/master/models/installation.rb

@@ -1,9 +1,20 @@
 module Spider; module Master
     
     class Installation < Spider::Model::Managed
-        element :name, String
-        element :apps, Text
-        element :configuration, Text
+        element :uuid, UUID
+        element :name, String, :label => _('Name')
+        choice :customer, Customer, :add_multiple_reverse => :installations
+        element :apps, Text, :hidden => true
+        element :configuration, Text, :hidden => true
+        element :last_check, DateTime, :hidden => true
+        element :interval, Fixnum, :hidden => true
+        
+        def to_s
+            str = self.name || self.uuid
+            if self.customer
+                str += " - #{self.customer}"
+            end
+        end
         
     end