From f148a4ebdd3d8640f96102bbb0b079f43abe7613 Mon Sep 17 00:00:00 2001 From: rene Date: Thu, 24 Mar 2022 18:10:34 +0100 Subject: [PATCH] mass replacement has its culpits --- roles/mastodon/tasks/system_setup/ruby.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/mastodon/tasks/system_setup/ruby.yml b/roles/mastodon/tasks/system_setup/ruby.yml index 2481400..7b5082c 100644 --- a/roles/mastodon/tasks/system_setup/ruby.yml +++ b/roles/mastodon/tasks/system_setup/ruby.yml @@ -3,14 +3,14 @@ - name: mastodon | Clone rbenv git: repo: "https://github.com/rbenv/rbenv.git" - dest: "{{ getent_passwd[mastodon_user][4] }}/.rbenv" + dest: "{{ mastodon_user }}/.rbenv" clone: true version: "{{ rbenv_version }}" - name: mastodon | Clone ruby-build git: repo: "https://github.com/rbenv/ruby-build.git" - dest: "{{ getent_passwd[mastodon_user][4] }}/.rbenv/plugins/ruby-build" + dest: "{{ mastodon_user }}/.rbenv/plugins/ruby-build" clone: true version: "{{ ruby_build_version }}" register: ruby_build @@ -18,36 +18,36 @@ - name: mastodon | Configure rbenv command: ./configure args: - chdir: "{{ getent_passwd[mastodon_user][4] }}/.rbenv/src" + chdir: "{{ mastodon_user }}/.rbenv/src" register: rbenv_configure - name: mastodon | Build rbenv command: make args: - chdir: "{{ getent_passwd[mastodon_user][4] }}/.rbenv/src" + chdir: "{{ mastodon_user }}/.rbenv/src" when: rbenv_configure is succeeded - name: mastodon | Update profile settings blockinfile: - dest: "{{ getent_passwd[mastodon_user][4] }}/.profile" + dest: "{{ mastodon_user }}/.profile" content: | - export PATH="{{ getent_passwd[mastodon_user][4] }}/.rbenv/bin:${PATH}" + export PATH="{{ mastodon_user }}/.rbenv/bin:${PATH}" eval "$(rbenv init -)" - name: mastodon | Check if the Ruby version is already installed - shell: "{{ getent_passwd[mastodon_user][4] }}/.rbenv/bin/rbenv versions | grep -q {{ ruby_version }}" + shell: "{{ mastodon_user }}/.rbenv/bin/rbenv versions | grep -q {{ ruby_version }}" register: ruby_installed ignore_errors: yes check_mode: no - name: mastodon | Install Ruby {{ ruby_version }} - shell: "{{ getent_passwd[mastodon_user][4] }}/.rbenv/bin/rbenv install {{ ruby_version }}" + shell: "{{ mastodon_user }}/.rbenv/bin/rbenv install {{ ruby_version }}" args: executable: /bin/bash when: ruby_installed is failed - name: mastodon | Set the default Ruby version to {{ ruby_version }} - shell: "{{ getent_passwd[mastodon_user][4] }}/.rbenv/bin/rbenv global {{ ruby_version }}" + shell: "{{ mastodon_user }}/.rbenv/bin/rbenv global {{ ruby_version }}" args: executable: /bin/bash register: default_ruby_version