7 files changed, 35 insertions, 8 deletions
diff --git a/cloudmasterd/extra/cloudmasterd-redirect.apache b/cloudmasterd/extra/cloudmasterd-redirect.apache
new file mode 100644
index 0000000..b9fa819
--- /dev/null
+++ b/cloudmasterd/extra/cloudmasterd-redirect.apache
@@ -0,0 +1,2 @@
+RewriteEngine On
+RewriteRule ^/$ http://%{SERVER_NAME}/cloud/status.html [NE]
diff --git a/cloudmasterd/extra/cloudmasterd.apache b/cloudmasterd/extra/cloudmasterd.apache
index eee8b37..a8160fd 100644
--- a/cloudmasterd/extra/cloudmasterd.apache
+++ b/cloudmasterd/extra/cloudmasterd.apache
@@ -1,5 +1,2 @@
-RewriteEngine On
-RewriteRule ^/$ http://%{SERVER_NAME}/cloud/status.html [NE]
-
 ProxyPass /cloud http://localhost:8107
 ProxyPassReverse /cloud http://localhost:8107
diff --git a/cloudmasterd/extra/cloudmasterd.spec b/cloudmasterd/extra/cloudmasterd.spec
index b510cea..9a4c284 100644
--- a/cloudmasterd/extra/cloudmasterd.spec
+++ b/cloudmasterd/extra/cloudmasterd.spec
@@ -6,13 +6,12 @@
 Summary: Genome library and web application for managing cloud machines
 Name: rubygem-%{gemname}
 Version: 1.0.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Group: Applications/System
 License: GPLv2
 URL: https://fedorahosted.org/genome
 Source0: %{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: httpd
 Requires: sqlite
 Requires: genome-func
 Requires: genome-styling
@@ -43,6 +42,25 @@ Func (https://fedorahosted.org/func) is used to aggregate all the information
 from the individual cloud instances to store in a sqlite database on the
 cloud master. 
 
+%package -n httpd-cloudmasterd
+Summary: ProxyPass support for the cloudmaster
+Requires: httpd
+Group: Applications/System
+
+%description -n httpd-cloudmasterd
+In order to abstract the port that the cloudmaster runs on,
+this RPM enables ProxyPass support from httpd to the cloudmaster
+daemon running on port 8107.
+
+%package -n httpd-cloudmasterd-redirect
+Summary: Enables redirecting the root context for the cloudmaster
+Requires: httpd
+Group: Applications/System
+
+%description -n httpd-cloudmasterd-redirect
+When this RPM is installed, the default context is redirected
+to the cloudmaster context.
+
 %prep
 
 %build
@@ -61,6 +79,7 @@ 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.apache %{buildroot}/etc/httpd/conf.d/cloudmasterd.conf
+mv %{buildroot}%{geminstdir}/extra/cloudmasterd-redirect.apache %{buildroot}/etc/httpd/conf.d/cloudmasterd-redirect.conf
 
 %clean
 rm -rf %{buildroot}
@@ -76,11 +95,16 @@ 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
 
+%files -n httpd-cloudmasterd
+/etc/httpd/conf.d/cloudmasterd.conf
+
+%files -n httpd-cloudmasterd-redirect
+/etc/httpd/conf.d/cloudmasterd-redirect.conf
+
 %changelog
 * Tue Jun 24 2008  <mhicks@redhat.com> - 1.0.0-1
 - Initial package
diff --git a/genome-repo/genome-repo-1.0.0/Cloud.ks b/genome-repo/genome-repo-1.0.0/Cloud.ks
index ea3b620..17ae834 100644
--- a/genome-repo/genome-repo-1.0.0/Cloud.ks
+++ b/genome-repo/genome-repo-1.0.0/Cloud.ks
@@ -63,6 +63,8 @@ bridge-utils
 libvirt
 koan
 git
+httpd-cloudmasterd
+httpd-cloudmasterd-redirect
 rubygem-cloudmasterd
 genome-bridge
 
diff --git a/genome-repo/genome-repo.spec b/genome-repo/genome-repo.spec
index d7392da..4facb5b 100644
--- a/genome-repo/genome-repo.spec
+++ b/genome-repo/genome-repo.spec
@@ -1,6 +1,6 @@
 Name:           genome-repo
 Version:        1.0.0
-Release:        43%{?dist}
+Release:        44%{?dist}
 Summary:        Genome repository 
 
 Group:          Applications/System
diff --git a/genome-respin/genome-respin.spec b/genome-respin/genome-respin.spec
index 42936ce..67733ea 100644
--- a/genome-respin/genome-respin.spec
+++ b/genome-respin/genome-respin.spec
@@ -2,7 +2,7 @@ Summary: Genome Respins
 Name: genome-respin
 Source: genome-respin-bin.tar.gz
 Version: 1.0.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Group: Applications/System
diff --git a/genome-respin/repo/conf.d/cloud-ks.cfg b/genome-respin/repo/conf.d/cloud-ks.cfg
index 5504192..bb7c3e7 100644
--- a/genome-respin/repo/conf.d/cloud-ks.cfg
+++ b/genome-respin/repo/conf.d/cloud-ks.cfg
@@ -53,6 +53,8 @@ bridge-utils
 vim-enhanced
 yum
 -yum-updatesd
+httpd-cloudmasterd
+httpd-cloudmasterd-redirect
 rubygem-cloudmasterd
 genome-bridge