Merge pull request #36 from beuss/master

server: add support for domain, protocol & root_url

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,14 +29,14 @@ 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
 ;enforce_domain = false
 
 # The full public facing url
-;root_url = %(protocol)s://%(domain)s:%(http_port)s/
+root_url = {{ server.root_url }}
 
 # Log web requests
 ;router_logging = false

grafana/map.jinja

@@ -6,6 +6,9 @@ Debian:
   service: grafana-server
   user: grafana
   group: grafana
+  protocol: http
+  domain: localhost
+  root_url: '%(protocol)s://%(domain)s:%(http_port)s/'
   path:
     home: /usr/share/grafana
     data: /var/lib/grafana