Make fullstaq ruby the default

diff --git a/cookbooks/ruby/attributes/default.rb b/cookbooks/ruby/attributes/default.rb
index 5bda1dd356e52720a01e25649125f75f3e06816a..444d260b8d636e637368ac68725a3d89b822936b 100644 (file)
--- a/cookbooks/ruby/attributes/default.rb
+++ b/cookbooks/ruby/attributes/default.rb
@@ -1,23 +1,4 @@
-default[:ruby][:fullstaq] = false
-
-if node[:ruby][:fullstaq]
-
-  default[:ruby][:version] = "3.4"
-  default[:ruby][:interpreter] = "/usr/lib/fullstaq-ruby/versions/#{node[:ruby][:version]}-jemalloc/bin/ruby"
-  default[:ruby][:gem] = "/usr/lib/fullstaq-ruby/versions/#{node[:ruby][:version]}-jemalloc/bin/gem"
-  default[:ruby][:bundle] = "/usr/lib/fullstaq-ruby/versions/#{node[:ruby][:version]}-jemalloc/bin/bundle"
-
-else
-
-  default[:ruby][:version] = if platform?("debian")
-                               "3.1"
-                             elsif node[:lsb][:release].to_f < 22.04
-                               "2.7"
-                             else
-                               "3.0"
-                             end
-  default[:ruby][:interpreter] = "/usr/bin/ruby#{node[:ruby][:version]}"
-  default[:ruby][:gem] = "/usr/bin/gem#{node[:ruby][:version]}"
-  default[:ruby][:bundle] = "/usr/bin/bundle#{node[:ruby][:version]}"
-
-end
+default[:ruby][:version] = "3.4"
+default[:ruby][:interpreter] = "/usr/lib/fullstaq-ruby/versions/#{node[:ruby][:version]}-jemalloc/bin/ruby"
+default[:ruby][:gem] = "/usr/lib/fullstaq-ruby/versions/#{node[:ruby][:version]}-jemalloc/bin/gem"
+default[:ruby][:bundle] = "/usr/lib/fullstaq-ruby/versions/#{node[:ruby][:version]}-jemalloc/bin/bundle"

diff --git a/cookbooks/ruby/recipes/default.rb b/cookbooks/ruby/recipes/default.rb
index 624b39485dbb833b27039e5ec89e6ecbba47fa2f..cbf2c53f3e40a6a6e390d05fe46ae0da8db41032 100644 (file)
--- a/cookbooks/ruby/recipes/default.rb
+++ b/cookbooks/ruby/recipes/default.rb
@@ -17,46 +17,19 @@
 # limitations under the License.
 #
 
-ruby_version = node[:ruby][:version]
-
-if node[:ruby][:fullstaq]
-
-  include_recipe "apt::fullstaq-ruby"
-
-  package %W[
-    fullstaq-ruby-common
-    fullstaq-ruby-#{ruby_version}-jemalloc
-  ]
-
-  %w[bundle bundler erb gem irb racc rake rbs rdbg rdoc ri ruby syntax_suggest typeproc].each do |command|
-    link "/usr/local/bin/#{command}" do
-      to "/usr/lib/fullstaq-ruby/versions/#{ruby_version}-jemalloc/bin/#{command}"
-      owner "root"
-      group "root"
-    end
-  end
+include_recipe "apt::fullstaq-ruby"
 
-else
+ruby_version = node[:ruby][:version]
 
-  package %W[
-    ruby
-    ruby#{ruby_version}
-    ruby-dev
-    ruby#{ruby_version}-dev
-  ]
+package %W[
+  fullstaq-ruby-common
+  fullstaq-ruby-#{ruby_version}-jemalloc
+]
 
-  gem_package "bundler#{ruby_version}-1" do
-    package_name "bundler"
-    version "~> 1.17.3"
-    gem_binary node[:ruby][:gem]
-    options "--format-executable"
+%w[bundle bundler erb gem irb racc rake rbs rdbg rdoc ri ruby syntax_suggest typeproc].each do |command|
+  link "/usr/local/bin/#{command}" do
+    to "/usr/lib/fullstaq-ruby/versions/#{ruby_version}-jemalloc/bin/#{command}"
+    owner "root"
+    group "root"
   end
-
-  gem_package "bundler#{ruby_version}-2" do
-    package_name "bundler"
-    version "~> 2.3.16"
-    gem_binary node[:ruby][:gem]
-    options "--format-executable"
-  end
-
 end

diff --git a/cookbooks/ruby/resources/bundle_install.rb b/cookbooks/ruby/resources/bundle_install.rb
index 897bde5fea49ae96763051c5f85391fc9ef80d15..2cf7ee632dc2697e6e7cc045901e64a1154e9249 100644 (file)
--- a/cookbooks/ruby/resources/bundle_install.rb
+++ b/cookbooks/ruby/resources/bundle_install.rb
@@ -47,6 +47,5 @@ action_class do
 end
 
 def after_created
-  subscribes :run, "gem_package[bundler#{node[:ruby][:version]}-1]"
-  subscribes :run, "gem_package[bundler#{node[:ruby][:version]}-2]"
+  subscribes :run, "package[fullstaq-ruby-#{node[:ruby][:version]}-jemalloc]"
 end

diff --git a/roles/dev.rb b/roles/dev.rb
index a3e67e0f0bb112d1370941aabe8bf12d0ddd05d2..f85849e888b70116b1a02cd232e55a273664316d 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -159,9 +159,6 @@ default_attributes(
       }
     }
   },
-  :ruby => {
-    :fullstaq => true
-  },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index e7c0e5850f171bebce1dadc49d154fa4e84f1970..396cf36dbeddd5a18aeb90b70aa74e6d9ea98eb4 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -30,9 +30,6 @@ default_attributes(
   :passenger => {
     :max_pool_size => 50
   },
-  :ruby => {
-    :fullstaq => true
-  },
   :exim => {
     :local_domains => ["messages.openstreetmap.org"],
     :routes => {