From 347d4d27f2e21a899dfc0dfe4f684cf7a1ed6a61 Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Sat, 19 Nov 2022 20:16:26 +0200
Subject: [PATCH] fix shells

---
 tasks/docker/docker.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tasks/docker/docker.yml b/tasks/docker/docker.yml
index 660df9e..9cbe407 100644
--- a/tasks/docker/docker.yml
+++ b/tasks/docker/docker.yml
@@ -34,8 +34,8 @@
 
 - name: Generate secret key
   shell: docker-compose run --rm web bundle exec rake secret
-    args:
-      cwd: "{{ mastodon_composer_folder }}"
+  args:
+    chdir: "{{ mastodon_composer_folder }}"
   register: secret_key_cmd
   when: mastodon_secret_key_base == ''
 
@@ -48,8 +48,8 @@
 
 - name: Generate OTP secret key
   shell: docker-compose run --rm web bundle exec rake secret
-    args:
-      cwd: "{{ mastodon_composer_folder }}"
+  args:
+    chdir: "{{ mastodon_composer_folder }}"
   register: otp_key_cmd
   when: mastodon_otp_secret == ''
 
@@ -62,8 +62,8 @@
 
 - name: Generate Paperclip secret key
   shell: docker-compose run --rm web bundle exec rake secret
-    args:
-      cwd: "{{ mastodon_composer_folder }}"
+  args:
+    chdir: "{{ mastodon_composer_folder }}"
   register: paperclip_key_cmd
   when: mastodon_paperclip_secret == ''
 
@@ -75,9 +75,9 @@
     backup: yes
 
 - name: Generate VAPID keypair
-  shell: docker-compose run --rm web bundle exec rake mastodon:webpush:generate_vapid_key
-    args:
-      cwd: "{{ mastodon_composer_folder }}"
+  shell: 'docker-compose run --rm web bundle exec rake mastodon:webpush:generate_vapid_key'
+  args:
+    chdir: "{{ mastodon_composer_folder }}"
   register: vapid_key_cmd
   when: vapid_public_key == ''
 
@@ -98,5 +98,5 @@
 - name: Set up database
   shell: docker-compose run --rm web rails db:migrate && echo "Database set up." > /var/lib/mastodon_db_setup
   args:
-    cretes: /var/lib/mastodon_db_setup
-    cwd: "{{ mastodon_composer_folder }}"
+    creates: /var/lib/mastodon_db_setup
+    chdir: "{{ mastodon_composer_folder }}"