From e7267cf2b592c33c56d9b448019b7db4da737ed0 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Tue, 16 Oct 2018 00:16:50 +0200
Subject: [PATCH] fix task order and add test data folder

---
 tasks/install.yml    | 11 +++++++++++
 tasks/post_tasks.yml | 11 -----------
 vars/main.yml        |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tasks/install.yml b/tasks/install.yml
index ff65350..f585e1f 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -20,5 +20,16 @@
       dest: "/etc/systemd/system/{{ __postgres_daemon }}.service"
       mode: 0644
     notify: __postgres_restart
+
+  - name: Check if database is initialized
+    stat:
+      path: "{{ postgresql_data_dir }}/PG_VERSION"
+    register: pgdata_dir_version
+
+  - name: Ensure database is initialized
+    command: "/usr/pgsql-{{ __postgres_version }}/bin/postgresql-{{ __postgres_version }}-setup initdb"
+    when: not pgdata_dir_version.stat.exists
+    become: true
+    become_user: "{{ postgres_user }}"
   become: True
   become_user: root
diff --git a/tasks/post_tasks.yml b/tasks/post_tasks.yml
index fa957fc..c8f40e8 100644
--- a/tasks/post_tasks.yml
+++ b/tasks/post_tasks.yml
@@ -6,14 +6,3 @@
     enabled: yes
   become: True
   become_user: root
-
-- name: Check if database is initialized
-  stat:
-    path: "{{ postgresql_data_dir }}/PG_VERSION"
-  register: pgdata_dir_version
-
-- name: Ensure database is initialized
-  command: "/usr/pgsql-{{ __postgres_version }}/bin/postgresql-{{ __postgres_version }}-setup initdb"
-  when: not pgdata_dir_version.stat.exists
-  become: true
-  become_user: "{{ postgres_user }}"
diff --git a/vars/main.yml b/vars/main.yml
index 19db9ee..c70cac4 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -6,5 +6,5 @@ __postgres_service_file: "/usr/lib/systemd/system/{{ __postgres_daemon }}.servic
 __postgres_packages:
   - "{{ __postgres_packagename }}"
   - "{{ __postgres_packagename }}-server"
-__postgres_data_dir: "/var/lib/pgsql/{{ __postgres_version }}/data"
+__postgres_data_dir: "/var/lib/pgsql/{{ __postgres_version }}/test/data"
 __postgres_config_path: "/var/lib/pgsql/data"