Merge branch 'master' of https://bitbucket.org/ikflowdat/stats into FD3-236

app/config/parameters.yml.dist

@@ -20,7 +20,8 @@ parameters:
 
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
     
-    grafana_url: 'http://200.50.168.108:3000/dashboard-solo/db/'
+    env(HOST_GRAFANA): grafana.%cookie_domain%
+    grafana_url: 'http://%env(HOST_GRAFANA)%/dashboard-solo/db/'
 
     db_session_host: 127.0.0.1
     db_session_port: null
@@ -48,7 +49,7 @@ parameters:
 
     env(CLIENT): ''
     cookie_domain_client: '%env(CLIENT)%'
-    cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
+    cookie_domain: '%cookie_domain_client%.%cookie_domain_client%.flowdat.com'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
     env(REDIS_HOST): "127.0.0.1" #Hay que borrar y usar HOST_REDIS
     env(HOST_REDIS): "127.0.0.1"

app/config/parameters.yml.docker

@@ -27,7 +27,8 @@ parameters:
     rabbit_mq.password: 'guest'
     rabbit_mq.vhost:    '/'
 
-    grafana_url: 'http://grafana.fd3.flowdat.com/dashboard-solo/db/'
+    env(HOST_GRAFANA): grafana.%cookie_domain%
+    grafana_url: 'http://%env(HOST_GRAFANA)%/dashboard-solo/db/'
 
     db_session_host: mysql
     db_session_port: ~