From e7b7b1e51b81f80714620fcd303619b2e2e27e28 Mon Sep 17 00:00:00 2001
From: staticsafe <me@staticsafe.ca>
Date: Mon, 27 Nov 2017 13:24:55 -0500
Subject: [PATCH] mastodon-systemd role should run earlier as we want to stop
 services in mastodon-postgresql/tasks/main.yml

---
 roles/mastodon-postgresql/tasks/main.yml | 6 ++++++
 site.yml                                 | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/roles/mastodon-postgresql/tasks/main.yml b/roles/mastodon-postgresql/tasks/main.yml
index 283c5ec..a1d02d5 100644
--- a/roles/mastodon-postgresql/tasks/main.yml
+++ b/roles/mastodon-postgresql/tasks/main.yml
@@ -8,6 +8,12 @@
      - postgresql
      - postgresql-contrib
      - python-psycopg2
+- name: Stop any Mastodon services that may be running
+  systemd: name={{ item }} state=stopped
+  with_items:
+    - mastodon-sidekiq
+    - mastodon-streaming
+    - mastodon-web
 - name: Add Mastodon PostgreSQL database user
   postgresql_user:
     name: mastodon
diff --git a/site.yml b/site.yml
index 3e064fe..05e7aac 100644
--- a/site.yml
+++ b/site.yml
@@ -5,8 +5,8 @@
     - common
     - ruby
     - mastodon-app
+    - mastodon-systemd
     - mastodon-postgresql
     - mastodon-redis
     - mastodon-nginx
-    - mastodon-systemd
     - mastodon-config