Adding initial redirect

4 files changed, 16 insertions, 6 deletions

diff --git a/cloudmasterd/Manifest.txt b/cloudmasterd/Manifest.txt
index 230494d..31858c6 100644
--- a/cloudmasterd/Manifest.txt
+++ b/cloudmasterd/Manifest.txt
@@ -1,3 +1,4 @@
+.gitignore
 History.txt
 License.txt
 Manifest.txt
@@ -8,10 +9,13 @@ bin/cloudmasterd-ctl
 config.example.yml
 config/hoe.rb
 config/requirements.rb
+extra/cloudmasterd.conf
 extra/cloudmasterd.redhat
+extra/cloudmasterd.spec
 lib/cloudmasterd.rb
 lib/cloudmasterd/version.rb
 log/debug.log
+primedb.rb
 script/console
 script/destroy
 script/generate
diff --git a/cloudmasterd/extra/cloudmasterd.spec b/cloudmasterd/extra/cloudmasterd.spec
index 9733ef3..79dc887 100644
--- a/cloudmasterd/extra/cloudmasterd.spec
+++ b/cloudmasterd/extra/cloudmasterd.spec
@@ -6,13 +6,14 @@
 
 Summary: daemon for machine configuration
 Name: rubygem-%{gemname}
-Version: 0.1.4
+Version: 0.1.5
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
 URL: http://cloudmasterd.rubyforge.org
 Source0: %{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: httpd
 Requires: rubygems
 Requires: rubygem(picnic) 
 Requires: rubygem(activesupport) 
@@ -42,6 +43,10 @@ mv %{buildroot}%{geminstdir}/config.example.yml %{buildroot}/etc/cloudmasterd/co
 rmdir %{buildroot}%{gemdir}/bin
 find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 
+# Put in the apache rules
+mkdir -p %{buildroot}/etc/httpd/conf.d
+mv %{buildroot}%{geminstdir}/extra/cloudmasterd.conf %{buildroot}/etc/httpd/conf.d
+
 %clean
 rm -rf %{buildroot}
 
@@ -58,6 +63,7 @@ rm -rf %{buildroot}
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 %config /etc/cloudmasterd/config.yml
+/etc/httpd/conf.d/cloudmasterd.conf
 
 %defattr(755, root, root, -)
 /etc/init.d/cloudmasterd
diff --git a/cloudmasterd/lib/cloudmasterd.rb b/cloudmasterd/lib/cloudmasterd.rb
index a9303c7..d26c9bb 100644
--- a/cloudmasterd/lib/cloudmasterd.rb
+++ b/cloudmasterd/lib/cloudmasterd.rb
@@ -251,7 +251,7 @@ module Cloudmasterd::Controllers
     end
   end
 
-  class Cloud < REST 'cloud'
+  class Status < REST 'status'
     def list
       @machines = {}
       Machine.find(:all, :select => "distinct email").map{|x| x.email}.each do |email|
@@ -259,7 +259,7 @@ module Cloudmasterd::Controllers
       end
 
       @memory = Memory.find(:all)[0][:free]
-      render :cloud
+      render :status
     end
   end
 end
@@ -275,7 +275,7 @@ module Cloudmasterd::Views
       html do
         head do
           title 'Everest Cloud Master Controller'
-          #link :rel => 'stylesheet', :type => 'text/css', :href => self/'/styles.css', :media => 'screen'
+          link :rel => 'stylesheet', :type => 'text/css', :href => "/styles.css", :media => 'screen'
         end
         body do
           div.content do
@@ -285,7 +285,7 @@ module Cloudmasterd::Views
       end
     end
 
-    def cloud
+    def status
       div.memory! do
         h2 "Available cloud memory: #{@memory}"
       end
diff --git a/cloudmasterd/lib/cloudmasterd/version.rb b/cloudmasterd/lib/cloudmasterd/version.rb
index ec06723..e3f960b 100644
--- a/cloudmasterd/lib/cloudmasterd/version.rb
+++ b/cloudmasterd/lib/cloudmasterd/version.rb
@@ -2,7 +2,7 @@ module Cloudmasterd #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end