From 1ec7c893eecdb987c3cb588ef9309fb59bbbcb3a Mon Sep 17 00:00:00 2001
From: Simon Schneider <simon.schneider@fhe3.com>
Date: Tue, 24 Jul 2018 12:22:13 +0200
Subject: [PATCH] add server.protocol and server.domain variables

---
 grafana/files/grafana.ini | 4 ++--
 grafana/map.jinja         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/grafana/files/grafana.ini b/grafana/files/grafana.ini
index 7742a8f..db3b64d 100644
--- a/grafana/files/grafana.ini
+++ b/grafana/files/grafana.ini
@@ -20,7 +20,7 @@ logs = {{ server.path.logs }}
 #################################### Server ####################################
 [server]
 # Protocol (http or https)
-;protocol = http
+protocol = {{ server.protocol }}
 
 # The ip address to bind to, empty will bind to all interfaces
 http_addr = {{ server.bind.address }}
@@ -29,7 +29,7 @@ http_addr = {{ server.bind.address }}
 http_port = {{ server.bind.port }}
 
 # The public facing domain name used to access grafana from a browser
-;domain = localhost
+domain = {{ server.domain }}
 
 # Redirect to correct domain if host header does not match domain
 # Prevents DNS rebinding attacks
diff --git a/grafana/map.jinja b/grafana/map.jinja
index c7c4bd4..3530117 100644
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@@ -11,9 +11,11 @@ Debian:
     data: /var/lib/grafana
     logs: /var/log/grafana
     pid_file_dir: /var/run/grafana
+  protocol: http
   bind:
     address: 0.0.0.0
     port: 3000
+  domain: localhost
   session:
     engine: file
   auth: