From 6bc22ab1165d7782c10734d43420ed2d8c8e50a4 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Sun, 3 May 2020 14:19:00 +0200
Subject: [PATCH] Grafana on :3000

---
 network.yml                  |  2 +-
 roles/grafana/tasks/main.yml | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/network.yml b/network.yml
index e007de0f..8f70b911 100755
--- a/network.yml
+++ b/network.yml
@@ -98,7 +98,7 @@
         - {from: re2o.crans.org, to: 10.231.136.9}
         - {from: intranet.crans.org, to: 10.231.136.9}
         - {from: autoconfig.crans.org, to: 10.231.136.46}
-        - {from: grafana.crans.org, to: 10.231.136.102}
+        - {from: grafana.crans.org, to: "10.231.136.102:3000"}
         - {from: webirc.crans.org, to: "10.231.136.1:9000"}
         - {from: framadate.crans.org, to: 10.231.136.153}
 
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 1442c08f..1d472f15 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -33,13 +33,6 @@
   retries: 3
   until: apt_result is succeeded
 
-# This capability enables grafana to bind :80
-- name: Add cap_net_bind_service to grafana
-  capabilities:
-    path: /usr/sbin/grafana-server
-    capability: cap_net_bind_service+ep
-    state: present
-
 - name: Configure Grafana
   ini_file:
     path: /etc/grafana/grafana.ini
@@ -48,9 +41,6 @@
     value: "{{ item.value }}"
     mode: 0640
   loop:
-    - section: server
-      option: http_port
-      value: "80"
     - section: server
       option: root_url
       value: "{{ grafana_root_url }}"