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

.drone.yml

@@ -19,7 +19,8 @@ pipeline:
     OAUTH_CLIENT_ID: ""
     OAUTH_CLIENT_SECRET: ""
     AMQP_KEY: ""
- 
+    CLIENT: fd3
+
   commands:
       - command -v mysqladmin >/dev/null 2>&1 || { echo "I require mysqladmin but it's not installed.  Aborting." >&2; exit 1; }
       - while ! mysqladmin ping -h 127.0.0.1 --silent; do :; done
@@ -27,7 +28,7 @@ pipeline:
 
       - yes | mysqladmin -h 127.0.0.1 create fd3_stats
       - yes | mysqladmin -h 127.0.0.1 create fd_session
-      
+
       - echo 'client = Flowdat3-Stats-Drone-Test' | tee /etc/flowdat.conf
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
 
@@ -43,7 +44,7 @@ pipeline:
    image: plugins/docker
    email: luciano@interlink.com.ar
    registry: docker.infra.flowdat.com
-   tag: 
+   tag:
      - "latest"
    when:
      event: [push]
@@ -54,7 +55,7 @@ pipeline:
    image: plugins/docker
    email: luciano@interlink.com.ar
    registry: docker.infra.flowdat.com
-   tag: 
+   tag:
      - "${DRONE_TAG:1:5}"
      - "${DRONE_TAG:1:3}"
    when:

app/config/bundles/hwi/oauth-bundle/parameters.yml.dist

@@ -1,6 +1,6 @@
 parameters:
-    client_id:           "1_4201udjx8vsw0go8g84wsksg4o8ogoow0sosc8k44c8cscwssw"
-    client_secret:       "42ymihqa8js408ggk4c0cccswcw8okcogww80co8cogsgc4woo"
-    access_token_url:    "http://127.0.0.1/base/app_dev.php/oauth/v2/token"
-    authorization_url:   "http://127.0.0.1/base/app_dev.php/oauth/v2/auth"
-    infos_url:           "http://127.0.0.1/base/app_dev.php/api/user/me"
+    client_id: '%env(OAUTH_CLIENT_ID)%'
+    client_secret: '%env(OAUTH_CLIENT_SECRET)%'
+    access_token_url: 'http://%env(HOST_BASE)%/oauth/v2/token'
+    authorization_url: 'http://%env(HOST_BASE)%/oauth/v2/auth'
+    infos_url: 'http://%env(HOST_BASE)%/api/user/me'

app/config/parameters.yml.dist

@@ -19,7 +19,7 @@ parameters:
     secret: ThisTokenIsNotSoSecretChangeIt
 
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
-    
+
     env(HOST_GRAFANA): grafana.%cookie_domain%
     grafana_url: 'http://%env(HOST_GRAFANA)%/dashboard-solo/db/'
 
@@ -47,7 +47,6 @@ parameters:
     rabbit_mq.password: 'guest'
     rabbit_mq.vhost:    '/'
 
-    env(CLIENT): ''
     cookie_domain_client: '%env(CLIENT)%'
     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]

composer.lock

@@ -1417,7 +1417,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "fc13213d31df24dd6a975969c0ff53cbb9ce5c87"
+                "reference": "a32ca73995f9b795caa96df1fb6b36c5baf9de18"
             },
             "type": "library",
             "autoload": {
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-12-12T15:42:32+00:00"
+            "time": "2017-12-14T11:01:09+00:00"
         },
         {
             "name": "ik/device-bundle",