Ver código fonte

Merge branch 'master' of bitbucket.org:ikflowdat/stats

Maximiliano Schvindt 6 anos atrás
pai
commit
968ec7a07f

+ 1 - 0
.drone.yml

@@ -21,6 +21,7 @@ pipeline:
     AMQP_KEY: ""
     CLIENT: fd3
     MYSQL_ROOT_PASSWORD: ""
+    DOMAIN: flowdat.com
 
   commands:
       - command -v mysqladmin >/dev/null 2>&1 || { echo "I require mysqladmin but it's not installed.  Aborting." >&2; exit 1; }

+ 1 - 1
app/config/parameters.yml.dist

@@ -51,7 +51,7 @@ parameters:
     rabbit_mq.vhost:    '/'
 
     cookie_domain_client: '%env(CLIENT)%'
-    cookie_domain: '%cookie_domain_client%.flowdat.com'
+    cookie_domain: '%cookie_domain_client%.%env(DOMAIN)%'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session, flowdat_dhcp_session]
     env(REDIS_HOST): redis
     env(HOST_REDIS): redis

+ 1 - 1
app/config/parameters.yml.docker

@@ -52,7 +52,7 @@ parameters:
     env(AMQP_KEY): stats
 
     cookie_domain_client: '%env(CLIENT)%'
-    cookie_domain: '%cookie_domain_client%.flowdat.com'
+    cookie_domain: '%cookie_domain_client%.%env(DOMAIN)%'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session, flowdat_dhcp_session]
     
     # nombre del servicio del nginx

+ 2 - 0
src/StatsBundle/Command/GenerateCrontabCommand.php

@@ -215,6 +215,8 @@ class GenerateCrontabCommand extends ContainerAwareCommand
             }
         }
 
+	fwrite($handle, PHP_EOL . PHP_EOL);
+
         fclose($handle);
         
         @unlink($fileCrontab);