imagery: extend tile expiry

[chef.git] / cookbooks / taginfo / recipes / default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index e4a6da00fe0867304cf5700a3389689aa0218d6d..ef3913c604cc76942d20f583b073a35dfa3b408e 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -179,10 +179,17 @@ node[:taginfo][:sites].each do |site|
     notifies :restart, "service[apache2]"
   end
 
+  bundle_config "#{directory}/taginfo" do
+    user "taginfo"
+    group "taginfo"
+    settings "deployment" => "true",
+             "without" => "development:test"
+  end
+
   bundle_install "#{directory}/taginfo" do
     action :nothing
-    user "root"
-    group "root"
+    user "taginfo"
+    group "taginfo"
     subscribes :run, "git[#{directory}/taginfo]"
     notifies :restart, "passenger_application[#{directory}/taginfo/web/public]"
   end
@@ -225,7 +232,8 @@ node[:taginfo][:sites].each do |site|
   prometheus_collector "taginfo-#{site_name}" do
     interval "15m"
     user "taginfo"
-    path "#{directory}/taginfo/sources/metrics.rb"
-    options "#{directory}/data"
+    path node[:ruby][:bundle]
+    options "exec sources/metrics.rb #{directory}/data"
+    working_directory "#{directory}/taginfo"
   end
 end