Make munin use the node name instead of the FQDN

[chef.git] / cookbooks / db / recipes / base.rb

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 6d6bc8ddc90b7c65c618ec8d2658a0fec662a3a7..2062b63bc298695c911d1cf42fbdd1f85150b537 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -34,14 +34,8 @@ directory "/srv/www.openstreetmap.org" do
   mode 0o2775
 end
 
   mode 0o2775
 end
 

-ruby_version = if node[:lsb][:release].to_f >= 18.04
-                 "2.5"
-               else
-                 "2.3"
-               end
-

 rails_port "www.openstreetmap.org" do
 rails_port "www.openstreetmap.org" do

-  ruby ruby_version
+  ruby "2.5"

   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"