Allow sidekiq and puma to co-exist

hosts

@@ -15,7 +15,7 @@ wooly.masto.yttrx.com
 wooly.masto.yttrx.com
 
 [webapp]
-#wooly.masto.yttrx.com
+wooly.masto.yttrx.com
 
 [yttrx:vars]
 ansible_python_interpreter=/usr/bin/python3

roles/mastodon/tasks/main.yml

@@ -23,6 +23,16 @@
     src: env.production.j2
     dest: /home/mastodon/live/.env.production
 
+- name: Install docker-compose.sh file
+  template:
+    src: docker-compose.sh.j2
+    dest: /usr/local/bin/docker-compose.sh
+
+- name: Set permissions of docker-compose.sh
+  file:
+    path: /usr/local/bin/docker-compose.sh
+    mode: '0755'
+
 - name: Install docker-compose.yml file
   template:
     src: docker-compose.yml.j2

roles/sidekiq/tasks/main.yml

@@ -2,5 +2,5 @@
   - name: Configure docker-compose.override.yml
     template:
       src: docker-compose.override.yml.j2
-      dest: /home/mastodon/live/docker-compose.override.yml
+      dest: /home/mastodon/live/docker-compose.sidekiq.yml
     notify: "docker-compose up"

roles/webapp/tasks/main.yml

@@ -2,5 +2,5 @@
   - name: Configure docker-compose.yml
     template:
       src: docker-compose.override.yml.j2
-      dest: /home/mastodon/live/docker-compose.override.yml
+      dest: /home/mastodon/live/docker-compose.webapp.yml
     notify: "docker-compose up"

sidekiq.yml

@@ -6,7 +6,7 @@
 
   handlers:
   - name: Re-up docker containers
-    command: docker-compose up -d --remove-orphans
+    command: /usr/local/bin/docker-compose.sh
     args:
       chdir: /home/mastodon/live
     listen: "docker-compose up"

webapp.yml

@@ -6,7 +6,7 @@
 
   handlers:
   - name: Re-up docker containers
-    command: docker-compose up -d
+    command: /usr/local/bin/docker-compose.sh
     args:
       chdir: /home/mastodon/live
     listen: "docker-compose up"