From 11746a2c064018a642486b208b2fdcaeae8ea8e5 Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Mon, 20 Jan 2020 15:26:33 -0600
Subject: Made pleroma roles idempotent.

---
 roles/nginx/tasks/main.yaml       |  2 +-
 roles/pleroma-otp/tasks/main.yaml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/roles/nginx/tasks/main.yaml b/roles/nginx/tasks/main.yaml
index 74c6d7e..5cace24 100644
--- a/roles/nginx/tasks/main.yaml
+++ b/roles/nginx/tasks/main.yaml
@@ -18,7 +18,7 @@
 - name: install certbot in nginx
   become: yes
   command: "certbot certonly --nginx -n --agree-tos -d {{nginx_server_name}} -m {{nginx_admin_email}}"
-  notify: restart nginx
+  changed_when: false
   when: nginx_enable_certbot
 
 - name: disable default site
diff --git a/roles/pleroma-otp/tasks/main.yaml b/roles/pleroma-otp/tasks/main.yaml
index 5276935..115db24 100644
--- a/roles/pleroma-otp/tasks/main.yaml
+++ b/roles/pleroma-otp/tasks/main.yaml
@@ -40,19 +40,20 @@
     - "{{pleroma_data_dir}}/{{pleroma_instance}}/static/emoji"
 
 - name: install pleroma db schema file
+  become: yes
   template:
     src: "setup_db.psql.j2"
-    dest: "/tmp/setup_db.psql"
+    dest: "/tmp/setup_db_{{pleroma_instance}}.psql"
     owner: "{{pleroma_db_superuser}}"
     group: "{{pleroma_db_superuser}}"
     mode: "0600"
-  become: yes
+  changed_when: false
 
 - name: install pleroma psql
   become: yes
   become_user: "{{pleroma_db_superuser}}"
-  command: "psql -f /tmp/setup_db.psql"
-  notify: restart pleroma instance
+  command: "psql -f /tmp/setup_db_{{pleroma_instance}}.psql"
+  changed_when: false
 
 - name: download and unarchive pleroma release
   become: yes
@@ -98,4 +99,4 @@
     chdir: "/opt/pleroma/"
   environment:
     PLEROMA_CONFIG_PATH: "/etc/pleroma/{{pleroma_instance}}.config.exs"
-  notify: restart pleroma instance
+  changed_when: false
-- 
cgit v1.2.3