Ver código fonte

updated config

Luciano Andrade 7 anos atrás
pai
commit
323f1573a1

+ 4 - 4
app/config/bundles/ik/device-bundle/parameters.yml.dist

@@ -1,5 +1,5 @@
 parameters:
-    device_check_url: 'http://127.0.0.1/base/app_dev.php/api/devices/check.json'
-    device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
-    device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
-    device_put_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
+    device_check_url: 'http://%env(HOST_BASE)%/api/devices/check.json'
+    device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
+    device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
+    device_put_url: 'http://%env(HOST_BASE)%/api/devices/'

+ 1 - 1
app/config/config.yml

@@ -6,6 +6,7 @@ imports:
     - { resource: url_webservice.yml }
     - { resource: "bundles/ik/base-admin-bundle/parameters.yml" }
     - { resource: "@FTTHBundle/Resources/config/services.yml" }
+    - { resource: "@RadiusBundle/Resources/config/services.yml" }
     - { resource: "@WebserviceBundle/Resources/config/services.yml" }
     - { resource: workflow.yml }
     - { resource: "../Resources/workflows/workflow_list.yml", ignore_errors: true  }
@@ -24,7 +25,6 @@ imports:
     - { resource: "@AuthBundle/Resources/config/services.yml" }
     - { resource: "@AuditBundle/Resources/config/services.yml" }
     - { resource: '@BaseAdminBundle/Resources/config/sonata-config.yml' }
-    - { resource: "@RadiusBundle/Resources/config/services.yml" }
 
 
 parameters:

+ 20 - 12
app/config/url_webservice.yml.dist

@@ -1,19 +1,27 @@
 parameters:
-    url_base: 'http://127.0.0.1/base/app_dev.php' # url app Base
-    url_mapas: 'http://127.0.0.1/mapas/app_dev.php' # url app Mapas
-    url_stats: 'http://127.0.0.1/stats/app_dev.php' # url app Stats
+    url_base: 'http://%env(HOST_BASE)%'
+    url_ftth: 'http://%env(HOST_FTTH)%'
+    url_mapas: 'http://%env(HOST_MAPAS)%'
+    url_stats: 'http://%env(HOST_STATS)%'
+    url_radius: 'http://%env(HOST_RADIUS)%'
+    url_cablemodem: 'http://%env(HOST_CABLEMODEM)%'
+    url_dhcp: 'http://%env(HOST_DHCP)%'
+    url_geoserver: 'http://%env(HOST_GEOSERVER)%' # url app radius
 
-    client: '%url_base%/api/clients.json'
-
-    sidebar_menu: # urls para el sidebar menu
-        Base: '%url_base%'
+    onu: '%url_ftth%/api/onus.json'
+    client: 'http://%env(HOST_BASE)%/api/clients.json'
+    sidebar_menu:
+        FTTH: '%url_ftth%'
+        Cablemodems: '%url_stats%'
         Mapas: '%url_mapas%'
         Stats: '%url_stats%'
-
-    # Url base create client
+        DHCP: '%url_dhcp%'
+    env(DOCKER_MAPAS): mapas
     remote_client_create_url: '%url_base%/admin/client/client/create'
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_log_url: '%url_base%/api/devicelogs.json'
-    remote_get_map_url: '%url_mapas%/api/maps.json'
-    remote_get_object_type_url: '%url_mapas%/api/objecttypes.json'
-    remote_get_objects_url: '%url_mapas%/api/objects.json'
+    remote_get_map_url: 'http://%env(DOCKER_MAPAS)%:8000/api/maps.json'
+    remote_get_object_type_url: 'http://%env(DOCKER_MAPAS)%:8000/api/objecttypes.json'
+    remote_get_objects_url: 'http://%env(DOCKER_MAPAS)%:8000/api/objects.json'
+    api_ftth: 'http://ftth:8000'
+    api_mapas: 'http://mapas:8000'

+ 19 - 9
app/config/url_webservice.yml.docker

@@ -1,17 +1,27 @@
 parameters:
     url_base: 'http://%env(HOST_BASE)%'
+    url_ftth: 'http://%env(HOST_FTTH)%'
     url_mapas: 'http://%env(HOST_MAPAS)%'
     url_stats: 'http://%env(HOST_STATS)%'
+    url_radius: 'http://%env(HOST_RADIUS)%'
+    url_cablemodem: 'http://%env(HOST_CABLEMODEM)%'
+    url_dhcp: 'http://%env(HOST_DHCP)%'
+    url_geoserver: 'http://%env(HOST_GEOSERVER)%' # url app radius
 
-    client: '%url_base%/api/clients.json'
-
-    remote_client_create_url: '%url_base%/admin/client/client/create'
-    remote_device_url: '%url_base%/api/devices.json'
-    remote_device_log_url: '%url_base%/api/devicelogs.json'
-    remote_get_map_url: '%url_mapas%/api/maps.json'
-    remote_get_object_type_url: '%url_mapas%/api/objecttypes.json'
-    remote_get_objects_url: '%url_mapas%/api/objects.json'
+    onu: '%url_ftth%/api/onus.json'
+    client: 'http://%env(HOST_BASE)%/api/clients.json'
     sidebar_menu:
-        Base: '%url_base%'
+        FTTH: '%url_ftth%'
+        Cablemodems: '%url_stats%'
         Mapas: '%url_mapas%'
         Stats: '%url_stats%'
+        DHCP: '%url_dhcp%'
+    env(DOCKER_MAPAS): mapas
+    remote_client_create_url: '%url_base%/admin/client/client/create'
+    remote_device_url: '%url_base%/api/devices.json'
+    remote_device_log_url: '%url_base%/api/devicelogs.json'
+    remote_get_map_url: 'http://%env(DOCKER_MAPAS)%:8000/api/maps.json'
+    remote_get_object_type_url: 'http://%env(DOCKER_MAPAS)%:8000/api/objecttypes.json'
+    remote_get_objects_url: 'http://%env(DOCKER_MAPAS)%:8000/api/objects.json'
+    api_ftth: 'http://ftth:8000'
+    api_mapas: 'http://mapas:8000'