summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jacob <adam@opscode.com>2010-02-03 21:47:17 -0800
committerAdam Jacob <adam@opscode.com>2010-02-03 21:47:17 -0800
commitd0cd67a24ec6c8a258b9ccf9b1874d319ae77cdf (patch)
tree249429da1edda8eb7a6e2b7e99f91ee862d62f81
parent89c9d6983ccda7dc55aae8d8607f5c2d06f28820 (diff)
downloadchef-d0cd67a24ec6c8a258b9ccf9b1874d319ae77cdf.tar.gz
Adding Web UI Rake Tasks
-rw-r--r--Rakefile36
-rwxr-xr-xscripts/mac-dev-start3
2 files changed, 37 insertions, 2 deletions
diff --git a/Rakefile b/Rakefile
index 9ecf2999aa..90683055dc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -119,6 +119,24 @@ def start_chef_server(type="normal")
end
end
+def start_chef_webui(type="normal")
+ puts "Starting #{type} chef development server webui"
+ @chef_webui_pid = nil
+ mcid = fork
+ if mcid # parent
+ @chef_webui_pid = mcid
+ else # child
+ case type
+ when "normal"
+ puts "Starting chef webui for development with './chef-server/bin/chef-server-webui -a thin -l debug -N'"
+ exec("./chef-server/bin/chef-server-webui -a thin -l debug -N")
+ when "features"
+ puts "Starting chef server webui for features with #{["./chef-server/bin/chef-server-webui -a thin -C #{File.join(File.dirname(__FILE__), "features", "data", "config", "server.rb")} -l debug -N"].join(' ')}"
+ exec("./chef-server/bin/chef-server-webui -a thin -C #{File.join(File.dirname(__FILE__), "features", "data", "config", "server.rb")} -l debug -N")
+ end
+ end
+end
+
def start_dev_environment(type="normal")
start_couchdb(type)
start_rabbitmq(type)
@@ -126,14 +144,20 @@ def start_dev_environment(type="normal")
start_chef_solr(type)
start_chef_solr_indexer(type)
start_chef_server(type)
+ start_chef_webui(type)
puts "Running CouchDB at #{@couchdb_server_pid}"
puts "Running RabbitMQ at #{@rabbitmq_server_pid}"
puts "Running Chef Solr at #{@chef_solr_pid}"
puts "Running Chef Solr Indexer at #{@chef_solr_indexer_pid}"
puts "Running Chef at #{@chef_server_pid}"
+ puts "Running Chef Web UI at #{@chef_webui_pid}"
end
def stop_dev_environment
+ if @chef_webui_pid
+ puts "Stopping Chef Web UI"
+ Process.kill("KILL", @chef_webui_pid)
+ end
if @chef_server_pid
puts "Stopping Chef"
Process.kill("KILL", @chef_server_pid)
@@ -216,6 +240,12 @@ namespace :dev do
wait_for_ctrlc
end
+ desc "Start Chef Web UI for testing"
+ task :chef_webui do
+ start_chef_webui("features")
+ wait_for_ctrlc
+ end
+
end
end
@@ -250,6 +280,12 @@ namespace :dev do
start_chef_server
wait_for_ctrlc
end
+
+ desc "Start Chef Web UI"
+ task :chef_webui do
+ start_chef_webui
+ wait_for_ctrlc
+ end
end
end
diff --git a/scripts/mac-dev-start b/scripts/mac-dev-start
index ceef75fd3d..350edbafcf 100755
--- a/scripts/mac-dev-start
+++ b/scripts/mac-dev-start
@@ -15,7 +15,7 @@ BASE_CMD = case ARGV[0]
else
"cd #{SRCDIR} && sudo rake dev:start:"
end
-SERVICES = ["couchdb","rabbitmq","chef_solr","chef_solr_indexer","chef_server"]
+SERVICES = ["couchdb","rabbitmq","chef_solr","chef_solr_indexer","chef_server","chef_webui"]
def auth_up
system("sudo echo")
@@ -47,7 +47,6 @@ def start_services
end
end
-
if __FILE__ == $0
start_services
end