Serve all openlayers legacy content with long expiry

[chef.git] / cookbooks / web / recipes / frontend.rb

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index eb95b18f7b49982c4c14d4b697f5ad9dcd6c36e7..1c71a2fd0f08eb024401dae239ab9070dc042d06 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: web
+# Cookbook:: web
 # Recipe:: frontend
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,6 +36,18 @@ apache_site "default" do
   action [:disable]
 end
 
+# Static legacy files used by external websites
+# eg: OpenLayers
+remote_directory "#{node[:web][:base_directory]}/static" do
+  source "static"
+  owner "root"
+  group "root"
+  mode "755"
+  files_owner "root"
+  files_group "root"
+  files_mode 0o644
+end
+
 apache_site "www.openstreetmap.org" do
   template "apache.frontend.erb"
   variables :status => node[:web][:status],
@@ -46,11 +58,7 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0o644
-end
-
-service "rails-jobs" do
-  action [:stop, :disable]
+  mode "644"
 end
 
 service "rails-jobs@mailers" do