From c3d6892609cd1c2d61e35fd8be8bef31681b5c8b Mon Sep 17 00:00:00 2001
From: rene <rene@endor.universe.local>
Date: Wed, 20 Apr 2022 21:27:37 +0200
Subject: [PATCH] rearranged tasks

---
 roles/mastodon/tasks/main.yml              |  2 +-
 roles/mastodon/tasks/system_setup/ruby.yml | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml
index a8564dd..4732140 100644
--- a/roles/mastodon/tasks/main.yml
+++ b/roles/mastodon/tasks/main.yml
@@ -8,10 +8,10 @@
 - include_tasks: system_setup/prepare_packagemanager.yml
 
 - block:
+  - include_tasks: system_setup/packages.yml
   - include_role: name=database
   - include_tasks: system_setup/prepare_database.yml
   - include_role: name=webserver
-  - include_tasks: system_setup/packages.yml
   - include_tasks: system_setup/nginx.yml
   - include_tasks: system_setup/user.yml
   - include_tasks: system_setup/ruby.yml
diff --git a/roles/mastodon/tasks/system_setup/ruby.yml b/roles/mastodon/tasks/system_setup/ruby.yml
index 25933eb..b7b1e5d 100644
--- a/roles/mastodon/tasks/system_setup/ruby.yml
+++ b/roles/mastodon/tasks/system_setup/ruby.yml
@@ -5,15 +5,7 @@
       repo: "https://github.com/rbenv/rbenv.git"
       dest: "{{ mastodon_home }}/.rbenv"
       clone: true
-      version: "{{ rbenv_version }}"
-
-  - name: mastodon | Clone ruby-build
-    git:
-      repo: "https://github.com/rbenv/ruby-build.git"
-      dest: "{{ mastodon_home }}/.rbenv/plugins/ruby-build"
-      clone: true
-      version: "{{ ruby_build_version }}"
-    register: ruby_build
+     # version: "{{ rbenv_version }}"
 
   - name: mastodon | Configure rbenv
     command: ./configure
@@ -34,6 +26,14 @@
         export PATH="{{ mastodon_home }}/.rbenv/bin:${PATH}"
         eval "$(rbenv init -)"
 
+  - name: mastodon | Clone ruby-build
+    git:
+      repo: "https://github.com/rbenv/ruby-build.git"
+      dest: "{{ mastodon_home }}/.rbenv/plugins/ruby-build"
+      clone: true
+      version: "{{ ruby_build_version }}"
+    register: ruby_build
+
   - name: mastodon | Check if the Ruby version is already installed
     shell: "{{ mastodon_home }}/.rbenv/bin/rbenv versions | grep -q {{ ruby_version }}"
     register: ruby_installed
@@ -41,7 +41,7 @@
     check_mode: no
 
   - name: mastodon | Install Ruby {{ ruby_version }}
-    shell: "{{ mastodon_home }}/.rbenv/bin/rbenv install {{ ruby_version }}"
+    shell: "RUBY_CONFIGURE_OPTS=--with-jemalloc {{ mastodon_home }}/.rbenv/bin/rbenv install {{ ruby_version }}"
     args:
       executable: /bin/bash
     when: ruby_installed is failed