From 4e886c293aede7b06ee42982c3cd226926b05d50 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Sat, 16 Jan 2021 20:05:53 +0100
Subject: [PATCH] Move handlers back to tasks

---
 roles/newsreader/handlers/main.yml | 48 +++++++-----------------------
 roles/newsreader/tasks/main.yml    |  5 +++-
 roles/newsreader/tasks/project.yml | 37 ++++++++++++++++++-----
 3 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/roles/newsreader/handlers/main.yml b/roles/newsreader/handlers/main.yml
index 6ed4827..6a926e7 100644
--- a/roles/newsreader/handlers/main.yml
+++ b/roles/newsreader/handlers/main.yml
@@ -1,62 +1,34 @@
-- name: install npm packages
-  become_user: "{{ app_user }}"
-  command: /usr/bin/npm install
-  args:
-    chdir: "{{ app_dir }}"
-
-- name: build static files
-  become_user: "{{ app_user }}"
-  command: /usr/bin/npm run build:prod
-  args:
-    chdir: "{{ app_dir }}"
-
-- name: run migrations
-  become_user: "{{ app_user }}"
-  django_manage:
-    command: migrate
-    app_path: "{{ app_dir }}/src/"
-    virtualenv: "{{ app_dir }}/.venv"
-    settings: "newsreader.conf.production"
-
-- name: collect static files
-  become_user: "{{ app_user }}"
-  django_manage:
-    command: collectstatic
-    app_path: "{{ app_dir }}/src/"
-    virtualenv: "{{ app_dir }}/.venv"
-    settings: "newsreader.conf.production"
-
 - name: restart gunicorn socket
   systemd:
-    daemon-reload: yes
+    daemon-reload: true
     name: gunicorn.socket
     state: restarted
-    enabled: yes
+    enabled: true
 
 - name: stop gunicorn service
   systemd:
-    daemon-reload: yes
+    daemon-reload: true
     name: gunicorn.service
     state: stopped
-    enabled: no
+    enabled: false
 
 - name: restart pgbouncer
   systemd:
-    daemon-reload: yes
+    daemon-reload: true
     name: pgbouncer
     state: restarted
-    enabled: yes
+    enabled: true
 
 - name: restart celery
   systemd:
-    daemon-reload: yes
+    daemon-reload: true
     name: celery
     state: restarted
-    enabled: yes
+    enabled: true
 
 - name: restart celerybeat
   systemd:
-    daemon-reload: yes
+    daemon-reload: true
     name: celerybeat
     state: restarted
-    enabled: yes
+    enabled: true
diff --git a/roles/newsreader/tasks/main.yml b/roles/newsreader/tasks/main.yml
index d642c48..77f908a 100644
--- a/roles/newsreader/tasks/main.yml
+++ b/roles/newsreader/tasks/main.yml
@@ -163,6 +163,9 @@
       }
 
 - name: ensure pgbouncer is restarted
-  service: name=pgbouncer state=restarted enabled=yes
+  systemd:
+    name: pgbouncer
+    state: restarted
+    enabled: true
 
 - include_tasks: "project.yml"
diff --git a/roles/newsreader/tasks/project.yml b/roles/newsreader/tasks/project.yml
index 8bf8bfa..8ae2c2e 100644
--- a/roles/newsreader/tasks/project.yml
+++ b/roles/newsreader/tasks/project.yml
@@ -20,13 +20,36 @@
     repo: "https://git.fudiggity.nl/sonny/newsreader.git"
     dest: "{{ app_dir }}"
     version: "{{ app_branch }}"
-    update: yes
-    force: yes
-  notify:
-    - install npm packages
-    - build static files
-    - run migrations
-    - collect static files
+    update: true
+    force: true
+
+- name: install npm packages
+  become_user: "{{ app_user }}"
+  command: /usr/bin/npm install
+  args:
+    chdir: "{{ app_dir }}"
+
+- name: build static files
+  become_user: "{{ app_user }}"
+  command: /usr/bin/npm run build:prod
+  args:
+    chdir: "{{ app_dir }}"
+
+- name: run migrations
+  become_user: "{{ app_user }}"
+  django_manage:
+    command: migrate
+    app_path: "{{ app_dir }}/src/"
+    virtualenv: "{{ app_dir }}/.venv"
+    settings: "newsreader.conf.production"
+
+- name: collect static files
+  become_user: "{{ app_user }}"
+  django_manage:
+    command: collectstatic
+    app_path: "{{ app_dir }}/src/"
+    virtualenv: "{{ app_dir }}/.venv"
+    settings: "newsreader.conf.production"
 
 - name: include poetry tasks
   include_role: