From 8feaa47430f59b9ffdc5a62f4d75107b3c00c5ff Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Wed, 20 Jan 2021 11:40:19 +0100
Subject: [PATCH] Expand the datanommer playbook to deploy datagrepper on the
 top of it

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 ansible/datanommer.yml           | 26 +++++++++++++++++++++++++-
 ansible/host_vars/datanommer.yml |  2 ++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ansible/datanommer.yml b/ansible/datanommer.yml
index bcae2d4..3785aaf 100644
--- a/ansible/datanommer.yml
+++ b/ansible/datanommer.yml
@@ -9,7 +9,8 @@
     - "secrets/secrets.yml"
 
   roles:
-    - postgresql_server
+    - {role: base, tags: ["base"]}
+    - {role: postgresql_server, tags: ["postgresql_server"]}
 
 - name: Set-up that database for datanommer
   hosts: datanommer
@@ -27,9 +28,32 @@
     postgresql_user:
       name: "{{ datanommer_user }}"
       password: "{{ datanommer_password }}"
+  - name: Set up the datagrepper DB user
+    postgresql_user:
+      name: "{{ datagrepper_app_user }}"
+      password: "{{ datagrepper_app_password }}"
   - name: Create the datanommer DB
     postgresql_db:
       name: "datanommer"
       owner: "{{ datanommer_user }}"
       encoding: UTF-8
 
+
+- name: Install/set-up datagrepper itself
+  hosts: datanommer
+  user: fedora
+  gather_facts: True
+  become: True
+
+  vars_files:
+    - "host_vars/datanommer.yml"
+    - "secrets/secrets.yml"
+
+  handlers:
+    - import_tasks: "handlers/restart_services.yml"
+
+  roles:
+    - {role: mod_wsgi, tags: ["mod_wsgi"]}
+    - {role: datagrepper, tags: ["datagrepper"]}
+
+
diff --git a/ansible/host_vars/datanommer.yml b/ansible/host_vars/datanommer.yml
index f55e8b6..3394a77 100644
--- a/ansible/host_vars/datanommer.yml
+++ b/ansible/host_vars/datanommer.yml
@@ -10,6 +10,8 @@ open_ports: [22, 80, 443]
 instance_type: r4.xlarge
 initiative_name: datanommer
 
+env: "production"
+wsgi_wants_apache: True
 
 # postgresql related vars