From bb73e214324d9750436b1f02c0e2631b1c12543e Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Fri, 7 Aug 2020 04:35:04 -0500
Subject: [PATCH] Create and configure Grafana before serving over Apache

---
 roles/grafana/tasks/main.yml | 46 ++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index d5384f6..f6ad712 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -19,6 +19,29 @@
             priv: "grafana.*:ALL,GRANT"
             login_user: root
             login_password: "{{ mysql.root_password }}"
+    - name: Add and configure packages
+      block:
+        - name: Add APT signing key
+          apt_key:
+            url: "https://packages.grafana.com/gpg.key"
+        - name: Add APT repo
+          apt_repository:
+            repo: "deb https://packages.grafana.com/oss/deb stable main"
+        - name: Install Grafana
+          apt:
+            name:
+              - grafana
+    - name: Configure Grafana
+      template:
+        src: "grafana.ini"
+        dest: "/etc/grafana/grafana.ini"
+        mode: "0640"
+    - name: Enable Grafana
+      systemd:
+        daemon_reload: yes
+        name: "grafana-server.service"
+        enabled: yes
+        state: "started"
     - name: Set up Apache
       block:
         - name: Enable modules
@@ -48,27 +71,4 @@
             name: https
           vars:
             website_url: "{{ grafana.url }}"
-    - name: Add and configure packages
-      block:
-        - name: Add APT signing key
-          apt_key:
-            url: "https://packages.grafana.com/gpg.key"
-        - name: Add APT repo
-          apt_repository:
-            repo: "deb https://packages.grafana.com/oss/deb stable main"
-        - name: Install Grafana
-          apt:
-            name:
-              - grafana
-    - name: Configure Grafana
-      template:
-        src: "grafana.ini"
-        dest: "/etc/grafana/grafana.ini"
-        mode: "0640"
-    - name: Enable Grafana
-      systemd:
-        daemon_reload: yes
-        name: "grafana-server.service"
-        enabled: yes
-        state: "started"
   become: yes