From d8df535754f5b4edfb1ee02f197ad63ce38a3a34 Mon Sep 17 00:00:00 2001
From: Kristijan Mitrovic <kmitrovic@itekako.com>
Date: Fri, 24 Jul 2020 16:13:05 +0200
Subject: [PATCH] Create bubble user, bubble-log group and log folder earlier

---
 .../packer/roles/bubble/tasks/main.yml        | 27 -------------------
 .../packer/roles/common/tasks/main.yml        | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/bubble-server/src/main/resources/packer/roles/bubble/tasks/main.yml b/bubble-server/src/main/resources/packer/roles/bubble/tasks/main.yml
index eb60b934..558ae7b9 100644
--- a/bubble-server/src/main/resources/packer/roles/bubble/tasks/main.yml
+++ b/bubble-server/src/main/resources/packer/roles/bubble/tasks/main.yml
@@ -9,25 +9,6 @@
 
 - import_tasks: postgresql.yml
 
-- name: Create bubble-log group
-  group:
-    name: bubble-log
-
-- name: Add root user to newly created group
-  user:
-    name: root
-    groups: bubble-log
-    append: yes
-
-- name: Create bubble user
-  user:
-    name: bubble
-    comment: bubble user
-    shell: /bin/bash
-    system: yes
-    home: /home/bubble
-    groups: bubble-log
-
 - name: Creates bubble API dir
   file:
     path: /home/bubble/api
@@ -36,14 +17,6 @@
     mode: 0555
     state: directory
 
-- name: Creates bubble logs dir
-  file:
-    path: /var/log/bubble
-    owner: bubble
-    group: bubble-log
-    mode: 0770
-    state: directory
-
 - name: Install bubble jar
   copy:
     src: bubble.jar
diff --git a/bubble-server/src/main/resources/packer/roles/common/tasks/main.yml b/bubble-server/src/main/resources/packer/roles/common/tasks/main.yml
index 373b1ba0..b2e4086d 100644
--- a/bubble-server/src/main/resources/packer/roles/common/tasks/main.yml
+++ b/bubble-server/src/main/resources/packer/roles/common/tasks/main.yml
@@ -57,3 +57,30 @@
     state: restarted
   with_items:
     - fail2ban
+
+- name: Create bubble-log group
+  group:
+    name: bubble-log
+
+- name: Add root user to newly created group
+  user:
+    name: root
+    groups: bubble-log
+    append: yes
+
+- name: Create bubble user
+  user:
+    name: bubble
+    comment: bubble user
+    shell: /bin/bash
+    system: yes
+    home: /home/bubble
+    groups: bubble-log
+
+- name: Creates bubble logs dir
+  file:
+    path: /var/log/bubble
+    owner: bubble
+    group: bubble-log
+    mode: 0770
+    state: directory