@@ -17,9 +17,7 @@
 # limitations under the License.
 #
 
-
-
-define :web_app, :docroot => nil, :canonical_hostname => false, :template => "web_app.conf.erb", :app_type => nil, :variables => nil do
+define :web_app, :docroot => nil, :canonical_hostname => nil, :template => nil do
 
   application_name = params[:name]
 
@@ -28,12 +26,16 @@
   include_recipe "apache2::mod_deflate"
   include_recipe "apache2::mod_headers"
 
-  template "#{node[:apache][:dir]}/sites-available/#{application_name}" do
-    source :template
+  template "#{node[:apache][:dir]}/sites-available/#{application_name}.conf" do
+    source params[:template]
     owner "root"
     group "root"
     mode 0644
-    variables :variables
+    variables(
+      :docroot => params[:docroot], 
+      :canonical_hostname => params[:canonical_hostname],
+      :application_name => application_name
+    )
     notifies :reload, resources(:service => "apache2"), :delayed
   end
 
 
@@ -34,7 +34,7 @@
   when "debian","ubuntu"
     name "apache2"
   end
-  supports :restart => true
+  supports :restart => true, :reload => true
   action :enable
 end
 
 
@@ -27,14 +27,3 @@
 package "python-django" do
   action :install
 end
-
-# To create a django web app configuration, in a site-cookbook:
-# create attributes file with
-# node[:django_app][:path]
-# node[:django_app][:python_path_extra]
-
-# in the recipe, create the web app resource. don't forget the template:
-# web_app "app_name" do
-#   docroot "/srv/app_name"
-#   template "app_name.conf.erb"
-# end