chef-server-webui 0.8.16 → 0.9.0.a3

data/app/views/layout/{chef_server_webui.html.haml → application.html.haml}

@@ -16,24 +16,24 @@
   %body
     #container
       #header
-        %h1= link_to "Chef Server", slice_url(:top)
+        %h1= link_to "Chef Server", url(:top)
         #user-navigation
           %ul
             - if session[:user]
-              %li= link_to "Logout #{h session[:user]} (#{session[:level].to_s})", slice_url(:users_logout), :method => "get", :confirm => "Are you sure you want to logout?"
+              %li= link_to "Logout #{h session[:user]} (#{session[:level].to_s})", url(:users_logout), :method => "get", :confirm => "Are you sure you want to logout?"
             - else
-              %li= link_to "Login", slice_url(:users_login), :rel => "facebox"
+              %li= link_to "Login", url(:users_login), :rel => "facebox"
           .clear
         #main-navigation
           %ul
-            %li= link_to "Search", slice_url(:searches)
-            %li= link_to "Status", slice_url(:status)
-            %li= link_to "Roles", slice_url(:roles)
-            %li= link_to "Nodes", slice_url(:nodes)
-            %li= link_to "Cookbooks", slice_url(:cookbooks)
-            %li= link_to "Databags", slice_url(:databags)
-            %li= link_to "Clients", slice_url(:clients)
-            %li= link_to "Users", slice_url(:users)
+            %li= link_to "Search", url(:searches)
+            %li= link_to "Status", url(:status)
+            %li= link_to "Roles", url(:roles)
+            %li= link_to "Nodes", url(:nodes)
+            %li= link_to "Cookbooks", url(:cookbooks)
+            %li= link_to "Databags", url(:databags)
+            %li= link_to "Clients", url(:clients)
+            %li= link_to "Users", url(:users)
           .clear
       #wrapper
         #main

data/app/views/layout/login.html.haml

@@ -14,7 +14,7 @@
   %body
     #container
       #header
-        %h1= link_to "Chef Server", slice_url(:top)
+        %h1= link_to "Chef Server", url(:top)
       #wrapper
         #main
           - unless message.empty?

data/app/views/nodes/_form.html.haml

@@ -42,7 +42,7 @@
 
     %div.group.form{:style => "position:relative;"}
       %label.label Attributes 
-      = partial '../layout/jsonedit', :json =>@node.attribute.to_json
+      = partial 'layout/jsonedit', :json =>@node.normal_attrs.to_json
     %div.group.form
       %span.description A JSON hash for default attributes for nodes of this node.  These attributes will only be applied if the node does not already have a value for the attributes.
 

data/app/views/nodes/_navigation.html.haml

@@ -1,9 +1,9 @@
 .secondary-navigation
   %ul
-    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', slice_url(:nodes))
-    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', slice_url(:new_node))
+    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:nodes))
+    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', url(:new_node))
     - if active != 'create' && active != 'index'
-      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', slice_url(:node, @node.name))
-      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', slice_url(:edit_node, @node.name))
-      %li= link_to('Delete', slice_url(:node, @node.name), :method => "delete", :confirm => "Really delete node #{@node.name}? There is no undo.")
+      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', url(:node, @node.name))
+      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', url(:edit_node, @node.name))
+      %li= link_to('Delete', url(:node, @node.name), :method => "delete", :confirm => "Really delete node #{@node.name}? There is no undo.")
   .clear

data/app/views/nodes/edit.html.haml

@@ -3,5 +3,5 @@
     %h2.title= "Node #{h @node.name}"
     .inner
       = partial('navigation', :active => 'edit')
-  = partial('form', :header => "Edit Node #{@node.name}", :form_id => 'edit_node', :submit_name => "Save Node", :submit_id => "edit_node_button", :form_for => 'edit', :form_url => slice_url(:node, @node.name) )
+  = partial('form', :header => "Edit Node #{@node.name}", :form_id => 'edit_node', :submit_name => "Save Node", :submit_id => "edit_node_button", :form_for => 'edit', :form_url => url(:node, @node.name) )
 

data/app/views/nodes/index.html.haml

@@ -12,14 +12,14 @@
             %th.last  
           - even = false
           - if @node_list.empty?
-            %td{:colspan => 4}= "You appear to have no nodes - try connecting one, or creating or editing a #{link_to('client', slice_url(:clients))}"
+            %td{:colspan => 4}= "You appear to have no nodes - try connecting one, or creating or editing a #{link_to('client', url(:clients))}"
           - else
-            - @node_list.each do |node, node_url|
+            - @node_list.each do |node|
               %tr{:class => even ? "even": "odd" }
-                %td{:colspan => 2}= link_to node, slice_url(:node, { :id => node } )
+                %td{:colspan => 2}= link_to node, url(:node, { :id => node } )
                 %td
-                  = link_to('Edit', slice_url(:edit_node, node)) 
+                  = link_to('Edit', url(:edit_node, node)) 
                   |
-                  = link_to('Delete', slice_url(:node, node), :method => "delete", :confirm => "Really delete Node #{node}?  There is no undo.")
-                - even ? even = false: even = true
+                  = link_to('Delete', url(:node, node), :method => "delete", :confirm => "Really delete Node #{node}?  There is no undo.")
+                - even = (not even)
 

data/app/views/nodes/new.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Node"
     .inner
       = partial('navigation', :active => 'create')
-  = partial('form', :header => "Create new Node", :form_id => 'create_node', :submit_name => "Create Node", :submit_id => "create_node_button", :form_for => 'create', :form_url => slice_url(:nodes))
+  = partial('form', :header => "Create new Node", :form_id => 'create_node', :submit_name => "Create Node", :submit_id => "create_node_button", :form_for => 'create', :form_url => url(:nodes))

data/app/views/nodes/show.html.haml

@@ -17,12 +17,11 @@
                   %tr
                     %td{:colspan => 2} This node has no roles or recipes applied.
                 - else
-                  -@node.run_list.each_index do |i|
-                    - type, name, fname = @node.run_list.parse_entry(@node.run_list[i])
+                  -@node.run_list.each_with_index do |run_list_item, i|
                     %tr
                       %td.position= i
-                      %td= name 
-                      %td= type 
+                      %td= run_list_item.name
+                      %td= run_list_item.type
           .left.accordion
             %h3.head= link_to("Recipes", "#")
             - full_recipe_list, default_attrs, override_attrs = @node.run_list.expand()
@@ -56,5 +55,5 @@
             
           .left
             %h3 Attributes
-            = build_tree('attrs', @node.attribute, default_attrs, override_attrs)
+            = build_tree('attrs', @node)
 

data/app/views/openid_consumer/index.html.haml

@@ -11,7 +11,7 @@
   .content
     %h2.title Login
     .inner
-      %form.form{ :method => "get", "accept-charset" => "UTF-8", :action => slice_url(:openid_consumer_login) }
+      %form.form{ :method => "get", "accept-charset" => "UTF-8", :action => url(:openid_consumer_login) }
         .group
           .text_field= text_field :openid_identifier
         .group
@@ -23,6 +23,6 @@
         .group
           .check_box= check_box :name => "force_post", :label => "Force the transaction to POST", :value => "0"
         .group
-          =link_to("Or, log in with username and password.", slice_url(:users_login))
+          =link_to("Or, log in with username and password.", url(:users_login))
         .group.navform
           .button= submit "Login →"

data/app/views/openid_register/index.html.haml

@@ -10,10 +10,10 @@
           %th.last  
           - @registered_nodes.sort{ |a,b| a.name.to_s <=> b.name.to_s }.each_with_index do |node, index|
             %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
-              %td{:colspan => 2}= link_to(node.name, slice_url(:registration, { :id => node.name }))
+              %td{:colspan => 2}= link_to(node.name, url(:registration, { :id => node.name }))
               %td
-                = link_to( (node.validated ? "Invalidate Registration" : "Validate Registration"), slice_url( :validate_registration, { :id => node.name} ), :method => "post", :confirm => "Are you sure you want to"  + (node.validated  ?  " invalidate " : " validate ") + "this node's registration?")
+                = link_to( (node.validated ? "Invalidate Registration" : "Validate Registration"), url( :validate_registration, { :id => node.name} ), :method => "post", :confirm => "Are you sure you want to"  + (node.validated  ?  " invalidate " : " validate ") + "this node's registration?")
                 |
-                = link_to((node.admin ? "Remove Admin Rights" : "Grant Admin Rights"), slice_url(:admin_registration, { :id => node.name}), :method => "post", :confirm => "Are you sure you want to"  + (node.admin ? " remove administrator privileges from this node?" : " grant administrator privileges to this node?"))
+                = link_to((node.admin ? "Remove Admin Rights" : "Grant Admin Rights"), url(:admin_registration, { :id => node.name}), :method => "post", :confirm => "Are you sure you want to"  + (node.admin ? " remove administrator privileges from this node?" : " grant administrator privileges to this node?"))
                 |
-                = link_to("Delete", slice_url(:registration, { :id => node.name} ), :method => "delete", :confirm => "Are you sure you want to delete this registration")
+                = link_to("Delete", url(:registration, { :id => node.name} ), :method => "delete", :confirm => "Are you sure you want to delete this registration")

data/app/views/openid_register/show.html.haml

@@ -2,6 +2,6 @@
   .content
     %h2.title= "Registration #{@registered_node.name}"
     .inner
-      = link_to "OpenID URL", slice_url(:openid_node, { :id => @registered_node.name.gsub(/\./, "_")})
+      = link_to "OpenID URL", url(:openid_node, { :id => @registered_node.name.gsub(/\./, "_")})
       %br= "Validated: #{@registered_node.validated}"
       %br= "Admin: #{@registered_node.admin}"

data/app/views/roles/_form.html.haml

@@ -45,7 +45,7 @@
 
     %div.group.form{:style => "position:relative;"}
       %label.label Default and Override Attributes 
-      = partial '../layout/jsonedit', :json => { :defaults => @role.default_attributes, :overrides => @role.override_attributes }.to_json
+      = partial 'layout/jsonedit', :json => { :defaults => @role.default_attributes, :overrides => @role.override_attributes }.to_json
       %span.description A JSON hash for default attributes for nodes of this role.  These attributes will only be applied if the node does not already have a value for the attributes.
     = form(:action => form_url, :method => :post, :id => form_id, :class => 'form') do
       %div.group

data/app/views/roles/_navigation.html.haml

@@ -1,9 +1,9 @@
 .secondary-navigation
   %ul
-    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', slice_url(:roles))
-    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', slice_url(:new_role))
+    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:roles))
+    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', url(:new_role))
     - if active != 'create' && active != 'index'
-      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', slice_url(:role, @role.name))
-      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', slice_url(:edit_role, @role.name))
-      %li= link_to('Delete', slice_url(:role, @role.name), :method => "delete", :confirm => "Really delete Role #{@role.name}? There is no undo.")
+      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', url(:role, @role.name))
+      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', url(:edit_role, @role.name))
+      %li= link_to('Delete', url(:role, @role.name), :method => "delete", :confirm => "Really delete Role #{@role.name}? There is no undo.")
   .clear

data/app/views/roles/edit.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Role #{h @role.name}"
     .inner
       = partial('navigation', :active => 'edit')
-  = partial('form', :header => "Edit Role #{@role.name}", :form_id => 'edit_role', :submit_name => "Save Role", :submit_id => "edit_role_button", :form_for => 'edit', :form_url => slice_url(:role, @role.name) )
+  = partial('form', :header => "Edit Role #{@role.name}", :form_id => 'edit_role', :submit_name => "Save Role", :submit_id => "edit_role_button", :form_for => 'edit', :form_url => url(:role, @role.name) )

data/app/views/roles/index.html.haml

@@ -13,9 +13,9 @@
           - even = false;
           - @role_list.each do |role|
             %tr{ :class => even ? "even" : "odd" }
-              %td{:colspan => 2}= link_to(role[0], slice_url(:role, role[0]))
+              %td{:colspan => 2}= link_to(role[0], url(:role, role[0]))
               %td
-                = link_to('Edit', slice_url(:edit_role, role[0])) 
+                = link_to('Edit', url(:edit_role, role[0])) 
                 |
-                = link_to('Delete', slice_url(:role, role[0]), :method => "delete", :confirm => "Really delete Role #{role[0]}?  there is no undo.")
-              - even ? even = false: even = true
+                = link_to('Delete', url(:role, role[0]), :method => "delete", :confirm => "Really delete Role #{role[0]}?  there is no undo.")
+              - even = (not even)

data/app/views/roles/new.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "Role"
     .inner
       = partial('navigation', :active => 'create')
-  = partial('form', :header => "Create new Role", :form_id => 'create_role', :submit_name => "Create Role", :submit_id => "create_role_button", :form_for => 'create', :form_url => slice_url(:roles))
+  = partial('form', :header => "Create new Role", :form_id => 'create_role', :submit_name => "Create Role", :submit_id => "create_role_button", :form_for => 'create', :form_url => url(:roles))

data/app/views/roles/show.html.haml

@@ -20,12 +20,11 @@
                   %tr
                     %td{:colspan => 2} This role does not include any roles or recipes.
                 - else
-                  -@role.run_list.each_index do |i|
-                    - type, name, fname = @role.run_list.parse_entry(@role.run_list[i])
+                  -@role.run_list.each_with_index do |run_list_item, i|
                     %tr
                       %td.position= i
-                      %td= name 
-                      %td= type 
+                      %td= run_list_item.name 
+                      %td= run_list_item.type 
           .left.accordion
             %h3.head= link_to("Recipes", "#")
             - full_recipe_list, default_attrs, override_attrs = @role.run_list.expand()

data/app/views/search/_search_form.html.haml

@@ -1,4 +1,4 @@
-%form{ :method => "get", :action => slice_url(:search, { :id => index_name }) }
+%form{ :method => "get", :action => url(:search, { :id => index_name }) }
   Q: 
   %input{ :type => "text", :name => "q" }
   A:

data/app/views/search/index.html.haml

@@ -3,6 +3,6 @@
     %h2.title Search Indexes
     .inner
       - @search_indexes.sort{ |a,b| a.to_s <=> b.to_s}.each do |index|
-        %form.form{ :method => "get", "accept-charset" => "UTF-8", :action => slice_url(:search, { :id => index[0]})}
+        %form.form{ :method => "get", "accept-charset" => "UTF-8", :action => url(:search, { :id => index[0]})}
           .group.label= text_field :name => "q", :label => "Query (i.e. attribute:value, leave empty to search all) "
           .group= submit "Search #{index[0]}"

data/app/views/search/show.html.haml

@@ -10,4 +10,4 @@
           - @results.each do |result|
             - result.each do |o|
               %tr
-                %td= link_to(o.name, slice_url(@type.to_sym, determine_name(@type.to_sym, o)))
+                %td= link_to(o.name, url(@type.to_sym, determine_name(@type.to_sym, o)))

data/app/views/status/index.html.haml

@@ -13,11 +13,11 @@
           %th.last Run List
           - if @status.empty?
             %tr
-              %td{:colspan => 7}= "You appear to have no nodes - try connecting one, or creating or editing a #{link_to('client', slice_url(:clients))}"
+              %td{:colspan => 7}= "You appear to have no nodes - try connecting one, or creating or editing a #{link_to('client', url(:clients))}"
           - else
             - @status.sort.each_with_index do |node, index|
               %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
-                %td= link_to(node[1].name, slice_url(:node, node[1].name))
+                %td= link_to(node[1].name, url(:node, node[1].name))
                 %td= "#{node[1]["platform"]} #{node[1]["platform_version"]}"
                 %td= node[1]["fqdn"]
                 %td= node[1]["ipaddress"]
@@ -31,9 +31,9 @@
                             %td= node[1]["uptime"]
                             
                 - unless node[1]["ohai_time"].nil?
-                  - current_time = DateTime.now
-                  - date = DateTime.parse(Time.at(node[1]["ohai_time"]).to_s)
-                  - hours, minutes, seconds, frac = DateTime.day_fraction_to_time(current_time - date)
+                  - current_time = Time.now.to_f
+                  - ohai_time = Time.at(node[1]["ohai_time"])
+                  - hours, minutes, seconds = time_difference_in_hms(ohai_time)
                   - hours_text   = "#{hours} hour#{hours == 1 ? '' : 's'}"
                   - minutes_text = "#{minutes} minute#{minutes == 1 ? '' : 's'}"
                   %td.flash
@@ -57,7 +57,7 @@
                           %table.table.tooltip
                             %tr
                               %td
-                                = date 
+                                = ohai_time 
                                 %br
                                   - if hours == 0
                                     = "#{minutes_text} ago" 
@@ -79,12 +79,9 @@
                               %tr
                                 %td{:colspan => 2} This node has no roles or recipes applied.
                             - else
-                              - rl = Chef::RunList.new
-                              - rl.reset!(node[1].run_list)
-                              -rl.each_index do |i|
-                                - type, name, fname = rl.parse_entry(rl[i])
+                              -node[1].run_list.each_with_index do |run_list_item, i|
                                 %tr
                                   %td.position= i
-                                  %td= name 
-                                  %td= type   
+                                  %td= run_list_item.name
+                                  %td= run_list_item.type
 

data/app/views/users/_form.html.haml

@@ -8,7 +8,7 @@
       %div.group
         .text_field= password_field :id=> "password", :name => "password", :label=>"Password: ", :class => "password_field"
       %br
-      =link_to("Or, log in with OpenID if you have one associated with an existing user account.", slice_url(:openid_consumer))
+      =link_to("Or, log in with OpenID if you have one associated with an existing user account.", url(:openid_consumer))
       %br 
     
     - if form_for == "edit"

data/app/views/users/_navigation.html.haml

@@ -1,9 +1,9 @@
 .secondary-navigation
   %ul
-    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', slice_url(:users))
-    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', slice_url(:users_new))
+    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:users))
+    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', url(:users_new))
     - if active != 'create' && active != 'index'
-      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', slice_url(:users_show))
-      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', slice_url(:users_edit, :user_id => params[:user_id]))
-      %li= link_to('Delete', slice_url(:users_delete, :user_id => params[:user_id]), :method => "delete", :confirm => "Really delete user #{params[:user_id]}? There is no undo.")
+      %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', url(:users_show))
+      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', url(:users_edit, :user_id => params[:user_id]))
+      %li= link_to('Delete', url(:users_delete, :user_id => params[:user_id]), :method => "delete", :confirm => "Really delete user #{params[:user_id]}? There is no undo.")
   .clear

data/app/views/users/edit.html.haml

@@ -3,4 +3,4 @@
     %h2.title= "User: #{h @user.name}"
     .inner
       = partial('navigation', :active => 'edit')
-  = partial('form', :header => "Edit User #{@user.name}", :form_id => 'edit_user', :submit_name => "Save User", :submit_id => "edit_user_button", :form_for => 'edit', :form_url => slice_url(:users_update, @user.name) )
+  = partial('form', :header => "Edit User #{@user.name}", :form_id => 'edit_user', :submit_name => "Save User", :submit_id => "edit_user_button", :form_for => 'edit', :form_url => url(:users_update, @user.name) )

data/app/views/users/index.html.haml

@@ -13,8 +13,8 @@
           - even = false
           - @users.sort.each do |user, user_url|
             %tr{:class => even ? "even": "odd" }
-              %td{:colspan => 2}= link_to user, slice_url(:users_show, :user_id => user)
+              %td{:colspan => 2}= link_to user, url(:users_show, :user_id => user)
               %td
-                = link_to('Edit', slice_url(:users_edit, :user_id => user)) 
+                = link_to('Edit', url(:users_edit, :user_id => user)) 
                 |
-                = link_to('Delete', slice_url(:users_delete, :user_id => user), :method => "delete", :confirm => "Really delete User #{user}?  There is no undo.")
+                = link_to('Delete', url(:users_delete, :user_id => user), :method => "delete", :confirm => "Really delete User #{user}?  There is no undo.")

data/app/views/users/login.html.haml

@@ -11,6 +11,6 @@
   .content
     %h2.title Login
     .inner
-  = partial('form', :header => "Login", :form_id => 'login', :submit_name => "login", :submit_id => "login_button", :form_for => 'login', :form_url => slice_url(:users_login_exec) )
+  = partial('form', :header => "Login", :form_id => 'login', :submit_name => "login", :submit_id => "login_button", :form_for => 'login', :form_url => url(:users_login_exec) )
     
      

data/app/views/users/new.html.haml

@@ -5,7 +5,7 @@
       = partial('navigation', :active => 'create')
     .content
       .inner
-        %form.form{ :method => "get", "accept-charset" => "UTF-8", :action => slice_url(:users_create) }
+        %form.form{ :method => "get", "accept-charset" => "UTF-8", :action => url(:users_create) }
           %table.table
             %tr
               %td= "Username"

data/bin/chef-server-webui

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+#
+# ./chef-server - Serving up piping hot infrastructure!
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Based on the 'merb' command, by Ezra
+
+# Add chef and chef-server-slice lib dirs to the load path
+# Load chef and chef-server slice from source rather than gem, if present
+
+require "rubygems"
+require "merb-core"
+
+# Load chef and chef-server-api from source rather than gem, if present
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib/chef'))
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
+
+require 'chef'
+require 'chef-server-webui'
+
+# Ensure the chef gem we load is the same version as the chef server
+unless defined?(Chef)
+  gem "chef", "=" + CHEF_SERVER_WEBUI_VERSION
+  require 'chef'  
+end
+
+#Dir.chdir File.join(File.dirname(__FILE__),"..")
+#__DIR__ = Dir.getwd
+
+if ARGV[0] && ARGV[0] =~ /^[^-]/
+  ARGV.push "-H"
+end 
+unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-a thin]
+end
+unless %w[-p --port].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-p 4040]
+end
+
+# Tell merb where to root
+ARGV.push *[ "-m", CHEF_SERVER_WEBUI_ROOT]
+
+if index = ARGV.index("-C")
+  config = ARGV[index+1]
+  ARGV.delete("-C")
+  ARGV.delete(config)
+  Chef::Config.from_file(File.expand_path(config))
+else
+  Chef::Config.from_file(
+    File.join("/etc", "chef", "server.rb")
+  )
+end
+
+Chef::Log.init(Chef::Config[:log_location]) 
+Chef::Log.level = Chef::Config[:log_level]
+
+Merb.start