Merge branch 'master' of https://bitbucket.org/ikflowdat/dhcp into FD3-536

Dockerfile

@@ -28,8 +28,15 @@ RUN apt-get install -yq php-soap
 
 RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; git clone git@bitbucket.org:ikflowdat/json-wsdl.git /opt/json-wsdl ;  cd /opt/json-wsdl ; composer install --no-scripts --no-interaction --no-progress
 
+RUN apt-get update && apt-get install -yq php-fpm
+RUN sed -i 's#listen = /run/php/php7.0-fpm.sock#listen = 0.0.0.0:9000#g' /etc/php/7.0/fpm/pool.d/www.conf
+RUN sed -i 's#;clear_env = no#clear_env = no#g' /etc/php/7.0/fpm/pool.d/www.conf
+RUN mkdir -p /run/php
+
 CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ;\
     composer install --no-scripts --no-interaction --no-progress;\
     rm var/cache/* -rf ;\
     composer run-script post-install-cmd --no-interaction ;\
-    php bin/console server:run 0.0.0.0 --env=dev
+    chmod 777 -R var/cache/ var/logs/ var/sessions/ ;\
+    php-fpm7.0 -F -R -O
+

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

@@ -1,6 +1,6 @@
 parameters:
     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'
+    access_token_url: 'https://%env(HOST_BASE)%/oauth/v2/token'
+    authorization_url: 'https://%env(HOST_BASE)%/oauth/v2/auth'
+    infos_url: 'https://%env(HOST_BASE)%/api/user/me'

composer.lock

@@ -6289,7 +6289,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },

src/KeaBundle/Services/KeaConfigService.php

@@ -48,7 +48,7 @@ class KeaConfigService
      *
      * @return string
      */
-    public function getConfig($id, $className = 'BaseKea', $library = '/home/iksop/kea-hook-cm/kea-hook-flowdat.so')
+    public function getConfig($id, $className = 'BaseKea', $library = '/kea-cm-hook/kea-hook-flowdat.so')
     {
         $config = '';
         $fullClass = 'KeaBundle\\Services\\' . $className;