execute tasks as user mastodon

roles/mastodon/tasks/main.yml

@@ -17,9 +17,5 @@
   - include_tasks: system_setup/nginx.yml
   - include_tasks: system_setup/user.yml
   - include_tasks: system_setup/ruby.yml
-    become: true
-    become_user: "{{ mastodon_user }}"
   - include_tasks: system_setup/mastodon.yml
-    become: true
-    become_user: "{{ mastodon_user }}"
   - include_tasks: system_setup/letsencrypt.yml

roles/mastodon/tasks/system_setup/mastodon.yml

@@ -1,3 +1,7 @@
+- block:
+  become: true
+  become_user: "{{ mastodon_user }}"
+
   - name: Clone mastodon
     git:
       repo: "https://github.com/mastodon/mastodon.git"
@@ -5,7 +9,7 @@
       clone: true
 
   # - name: Update to latest version
-#   shell: "git fetch; git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)"
+  #   shell: "git fetch; git checkout $(git tag -l | grep -v 'rc[1-9]*$' | sort -V | tail -n 1)"
   #   args:
   #     chdir: "{{ mastodon_home }}/{{ mastodon_path }}"
 
@@ -23,27 +27,6 @@
     args:
       chdir: "{{ mastodon_home }}/{{ mastodon_path }}"
 
-- name: Install systemd sidekiq Service Files
-  template:
-    src: mastodon-sidekiq.service.j2
-    dest: /etc/systemd/system/mastodon-sidekiq.service
-  become: true
-  become_user: root
-
-- name: Install systemd web Service Files
-  template:
-    src: mastodon-web.service.j2
-    dest: /etc/systemd/system/mastodon-web.service
-  become: true
-  become_user: root
-
-- name: Install systemd streaming Service Files
-  template:
-    src: mastodon-streaming.service.j2
-    dest: /etc/systemd/system/mastodon-streaming.service
-  become: true
-  become_user: root
-
   - name: Media cleanup cronjob
     cron:
       name: "media cleanup"
@@ -66,35 +49,38 @@
       chdir: "{{ mastodon_home }}/{{ mastodon_path }}"
     when: production_config.stat.exists
 
+- name: Install systemd sidekiq Service Files
+  template:
+    src: mastodon-sidekiq.service.j2
+    dest: /etc/systemd/system/mastodon-sidekiq.service
+  
+- name: Install systemd web Service Files
+  template:
+    src: mastodon-web.service.j2
+    dest: /etc/systemd/system/mastodon-web.service
+  
+- name: Install systemd streaming Service Files
+  template:
+    src: mastodon-streaming.service.j2
+    dest: /etc/systemd/system/mastodon-streaming.service
+  
 - name: Enable mastodon-web
   command: systemctl enable mastodon-web.service
-  become: true
-  become_user: root
 
 - name: Enable mastodon-streaming
   command: systemctl enable mastodon-streaming.service
-  become: true
-  become_user: root
 
 - name: Enable mastodon-sidekiq
   command: systemctl enable mastodon-sidekiq.service
-  become: true
-  become_user: root
 
 - name: Restart mastodon-web
   command: systemctl restart mastodon-web.service
   when: production_config.stat.exists
-  become: true
-  become_user: root
 
 - name: Restart mastodon-streaming
   command: systemctl restart mastodon-streaming.service
   when: production_config.stat.exists
-  become: true
-  become_user: root
   
 - name: Restart mastodon-sidekiq
   command: systemctl restart mastodon-sidekiq.service
   when: production_config.stat.exists
-  become: true
-  become_user: root

roles/mastodon/tasks/system_setup/ruby.yml

@@ -1,4 +1,8 @@
 ---
+- block:
+  become: true
+  become_user: "{{ mastodon_user }}"
+
   - name: mastodon | Clone rbenv
     git:
       repo: "https://github.com/rbenv/rbenv.git"