Fix writefreely role to be idempotent.

2 files changed, 14 insertions, 8 deletions

diff --git a/writefreely/handlers/main.yaml b/writefreely/handlers/main.yaml
index a5eedcb..7317489 100644
--- a/writefreely/handlers/main.yaml
+++ b/writefreely/handlers/main.yaml
@@ -3,3 +3,10 @@
 - name: reload service
   become: yes
   systemd: name="writefreely@{{writefreely_instance}}.service" enabled="yes" daemon_reload="yes"
+
+- name: migrate db
+  become: yes
+  become_user: "{{writefreely_user}}"
+  command: "writefreely db migrate"
+  args:
+    chdir: "{{writefreely_dir}}/{{writefreely_instance}}/"
diff --git a/writefreely/tasks/main.yaml b/writefreely/tasks/main.yaml
index b0d1e45..964644c 100644
--- a/writefreely/tasks/main.yaml
+++ b/writefreely/tasks/main.yaml
@@ -23,6 +23,7 @@
     owner: "{{writefreely_user}}"
     group: "{{writefreely_user}}"
     mode: "0755"
+  notify: migrate db
 
 - name: create root dir
   become: yes
@@ -64,12 +65,18 @@
     group: "{{writefreely_user}}"
   notify: reload service
 
+- name: check if keys exists
+  stat:
+    path: "{{writefreely_dir}}/{{writefreely_instance}}/keys/cookies_auth.aes256"
+  register: keys_file
+
 - name: generate keys
   become: yes
   become_user: "{{writefreely_user}}"
   command: "writefreely keys gen"
   args:
     chdir: "{{writefreely_dir}}/{{writefreely_instance}}/"
+  when: not key_file.stat.exists
 
 - name: check if db exists
   stat:
@@ -92,14 +99,6 @@
     chdir: "{{writefreely_dir}}/{{writefreely_instance}}/"
   when: not db_file.stat.exists
 
-- name: migrate db
-  become: yes
-  become_user: "{{writefreely_user}}"
-  command: "writefreely db migrate"
-  args:
-    chdir: "{{writefreely_dir}}/{{writefreely_instance}}/"
-  when: db_file.stat.exists
-
 - name: install systemd service
   become: yes
   template: