소스 검색

CP's en Dockerfile removidos. Verify-peer: false. Parameters corregido.

Daniel Libonati 7 년 전
부모
커밋
56e3382f0d
3개의 변경된 파일10개의 추가작업 그리고 10개의 파일을 삭제
  1. 0 5
      Dockerfile
  2. 5 0
      app/config/config.yml
  3. 5 5
      app/config/hwioauthbundle/parameters.yml.dist

+ 0 - 5
Dockerfile

@@ -41,11 +41,6 @@ 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 ;\
-    cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
-    cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
-    cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
-    cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
-    cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml ;\
     composer run-script post-install-cmd --no-interaction ;\
     cat app/config/hwioauthbundle/parameters.yml ;\
     chmod 777 -R var/cache/ var/logs/ var/sessions/ ;\

+ 5 - 0
app/config/config.yml

@@ -124,3 +124,8 @@ sonata_admin:
     persist_filters: true
     security:
         handler: sonata.admin.security.handler.role
+
+# Accept self-signed certificates
+hwi_oauth:
+    http_client:
+        verify_peer: false

+ 5 - 5
app/config/hwioauthbundle/parameters.yml.dist

@@ -1,6 +1,6 @@
 parameters:
-    client_id:           "1_4201udjx8vsw0go8g84wsksg4o8ogoow0sosc8k44c8cscwssw"
-    client_secret:       "42ymihqa8js408ggk4c0cccswcw8okcogww80co8cogsgc4woo"
-    access_token_url:    "https://127.0.0.1/base/app_dev.php/oauth/v2/token"
-    authorization_url:   "https://127.0.0.1/base/app_dev.php/oauth/v2/auth"
-    infos_url:           "https://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: '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'