Grafana on :3000

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}
 

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 }}"