diff --git a/ansible1/roles/packages/tasks/install-from-source.yml b/ansible1/roles/packages/tasks/install-from-source.yml index c81ed70aa..efd6e7524 100644 --- a/ansible1/roles/packages/tasks/install-from-source.yml +++ b/ansible1/roles/packages/tasks/install-from-source.yml @@ -12,7 +12,7 @@ apt: name: "{{ ruby_build_packages }}" state: present - when: ansible_os_family === 'Debian' + when: ansible_os_family == 'Debian' - name: Ensure that /var/cache/ansible/ exists file: @@ -25,12 +25,12 @@ register: ruby_version_marker - name: Download, extract and install ruby - when: not ruby_version_maker.stat.exists + when: not ruby_version_marker.stat.exists block: - name: Download ruby get_url: url: "{{ ruby_download_url }}" - dest: "{{ workspace }}/ruby-{{ ruby_version }}.tag.gz" + dest: "{{ workspace }}/ruby-{{ ruby_version }}.tar.gz" - name: Extract ruby unarchive: diff --git a/ansible1/roles/packages/tasks/main.yml b/ansible1/roles/packages/tasks/main.yml index 1b2c39e10..3a780907a 100644 --- a/ansible1/roles/packages/tasks/main.yml +++ b/ansible1/roles/packages/tasks/main.yml @@ -35,6 +35,15 @@ become_user: "{{ ruby_install_gems_user }}" with_items: "{{ ruby_install_gems }}" +# Install Bundler +- name: Install Bundler + gem: + name: bundler + version: "{{ bundler_version }}" + state: present + user_install: false + when: ruby_install_bundler + # Install Ruby on Rails - name: Install Ruby on Rails gem: diff --git a/ansible1/roles/packages/vars/main.yml b/ansible1/roles/packages/vars/main.yml index a3adb596b..34d5c496d 100644 --- a/ansible1/roles/packages/vars/main.yml +++ b/ansible1/roles/packages/vars/main.yml @@ -1,7 +1,11 @@ --- ruby_version: "3.3.5" rails_version: "7.1.2" +bundler_version: "2.2.8" +puma_version: "5.6.9" ruby_install_rails: true +ruby_install_from_source: true +ruby_install_bundler: true __ruby_packages: - ruby-full - ruby-dev @@ -23,5 +27,6 @@ __ruby_build_packages: ruby_rubygems_package_name: rubygems ruby_download_url: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz workspace: /root -puma_version: "6.3.0" ruby_install_puma: true +ruby_source_configure_command: ./configure --enable-shared +ruby_install_gems: []