Add OSUOSL machines to backup allow list

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

diff --git a/cookbooks/owl/recipes/default.rb b/cookbooks/owl/recipes/default.rb
index 819abdd789ad34cb018b6cf459012d547f830233..302050e67c07463dd1f48b4e1f13554e159fd924 100644 (file)
--- a/cookbooks/owl/recipes/default.rb
+++ b/cookbooks/owl/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -36,8 +36,6 @@ gem_package "bundler#{node[:owl][:ruby]}" do
   options "--format-executable"
 end
 
-apache_module "deflate"
-
 apache_module "passenger" do
   conf "passenger.conf.erb"
 end
@@ -84,7 +82,7 @@ end
 directory "/srv/owl.openstreetmap.org" do
   owner "owl"
   group "owl"
-  mode 02775
+  mode 0o2775
 end
 
 file "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt" do
@@ -97,7 +95,7 @@ execute "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile" do
   cwd "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails"
   user "root"
   group "root"
-  notifies :touch, resources(:file => "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt")
+  notifies :touch, "file[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp/restart.txt]"
 end
 
 git "/srv/owl.openstreetmap.org/openstreetmap-watch-list" do
@@ -106,7 +104,7 @@ git "/srv/owl.openstreetmap.org/openstreetmap-watch-list" do
   revision "owl.osm.org"
   user "owl"
   group "owl"
-  notifies :run, resources(:execute => "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile")
+  notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"
 end
 
 directory "srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/tmp" do
@@ -123,12 +121,12 @@ template "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/config/datab
   source "database.yml.erb"
   owner "owl"
   group "owl"
-  mode 0664
-  notifies :run, resources(:execute => "/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile")
-  only_if { node[:postgresql][:clusters]["9.1/main"] }
+  mode 0o664
+  notifies :run, "execute[/srv/owl.openstreetmap.org/openstreetmap-watch-list/rails/Gemfile]"
+  only_if { node[:postgresql][:clusters][:"9.1/main"] }
 end
 
 apache_site "owl.openstreetmap.org" do
   template "apache.erb"
-  variables :aliases => [ "owl.osm.org" ]
+  variables :aliases => ["owl.osm.org"]
 end