Commit ff4efc86 authored by Alex Felippe Chiozo's avatar Alex Felippe Chiozo
Browse files

atualiza plugin MapasNetwork

parent 0bfa53f4
Pipeline #11945 passed with stages
in 2 minutes and 21 seconds
<?php <?php
use MapasCulturais\i; use MapasCulturais\i;
if (env('REDIS_CACHE', false)) { if (env('REDIS_CACHE', false)) {
...@@ -6,7 +6,7 @@ if (env('REDIS_CACHE', false)) { ...@@ -6,7 +6,7 @@ if (env('REDIS_CACHE', false)) {
$redis->connect('redis'); $redis->connect('redis');
$cache = new \Doctrine\Common\Cache\RedisCache; $cache = new \Doctrine\Common\Cache\RedisCache;
$cache->setRedis($redis); $cache->setRedis($redis);
$redis = new \Redis(); $redis = new \Redis();
$redis->connect('redis'); $redis->connect('redis');
$mscache = new \Doctrine\Common\Cache\RedisCache; $mscache = new \Doctrine\Common\Cache\RedisCache;
...@@ -32,11 +32,14 @@ return [ ...@@ -32,11 +32,14 @@ return [
'Subsite' => THEMES_PATH . 'Subsite/', 'Subsite' => THEMES_PATH . 'Subsite/',
), ),
'registration.autosaveTimeout' => env('REGISTRATION_AUTOSAVE_INTERVAL', MINUTE_IN_SECONDS * 1000),
'doctrine.database' => [ 'doctrine.database' => [
'host' => env('DB_HOST', 'db'), 'host' => env('DB_HOST', 'db'),
'dbname' => env('DB_NAME', 'mapas'), 'dbname' => env('DB_NAME', 'mapas'),
'user' => env('DB_USER', 'mapas'), 'user' => env('DB_USER', 'mapas'),
'password' => env('DB_PASS', 'mapas'), 'password' => env('DB_PASS', 'mapas'),
'server_version' => env('DB_VERSION', 10), 'server_version' => env('DB_VERSION', 10),
] ],
'ini.set' => json_decode(env('PHP_INI_SET', '[]'))
]; ];
\ No newline at end of file
...@@ -10,8 +10,8 @@ $config_plugins = [ ...@@ -10,8 +10,8 @@ $config_plugins = [
"enable" => env("LOCATION_PATCH_ENABLE", true), "enable" => env("LOCATION_PATCH_ENABLE", true),
"cutoff" => env("LOCATION_PATCH_CUTOFF", "19800101000001"), "cutoff" => env("LOCATION_PATCH_CUTOFF", "19800101000001"),
], ],
], ],
'MultipleLocalAuth' => [ 'namespace' => 'MultipleLocalAuth' ], 'MultipleLocalAuth' => [ 'namespace' => 'MultipleLocalAuth' ],
'AldirBlanc' => [ 'AldirBlanc' => [
'namespace' => 'AldirBlanc', 'namespace' => 'AldirBlanc',
...@@ -369,10 +369,10 @@ A Secult lamenta o grave erro do Governo Federal, mas reitera que não é possí ...@@ -369,10 +369,10 @@ A Secult lamenta o grave erro do Governo Federal, mas reitera que não é possí
'MapasBlame' => [ 'MapasBlame' => [
'namespace' => 'MapasBlame', 'namespace' => 'MapasBlame',
'config' => [ 'config' => [
'request.logData.PATCH' => function ($data) { 'request.logData.PATCH' => function ($data) {
return $data; return $data;
}, },
] ]
], ],
"MapasNetwork" => [ "MapasNetwork" => [
...@@ -384,13 +384,8 @@ A Secult lamenta o grave erro do Governo Federal, mas reitera que não é possí ...@@ -384,13 +384,8 @@ A Secult lamenta o grave erro do Governo Federal, mas reitera que não é possí
'space' => [ 'En_Estado' => 'PA' ], 'space' => [ 'En_Estado' => 'PA' ],
] ]
] ]
] ]
] ]
]; ];
if(!env("MAPAS_NETWORK_ENABLED", false)){
unset($config_plugins['plugins']['MapasNetwork']);
}
return $config_plugins; return $config_plugins;
\ No newline at end of file
...@@ -14,22 +14,37 @@ services: ...@@ -14,22 +14,37 @@ services:
- ../compose/common/config.d:/var/www/html/protected/application/conf/conf-common.d - ../compose/common/config.d:/var/www/html/protected/application/conf/conf-common.d
- ../compose/local/config.d:/var/www/html/protected/application/conf/config.d - ../compose/local/config.d:/var/www/html/protected/application/conf/config.d
- ../../mapasculturais/src/protected/application/themes:/var/www/html/protected/application/themes
- ../../mapasculturais/src/protected/application/lib:/var/www/html/protected/application/lib
- ../../mapasculturais/src/protected/db-updates.php:/var/www/html/protected/db-updates.php
- ../../mapasculturais/src/protected/application/conf/agent-types.php:/var/www/html/protected/application/conf/agent-types.php
- ../../mapasculturais/src/protected/application/conf/space-types.php:/var/www/html/protected/application/conf/space-types.php
# themes and plugins # themes and plugins
- ../themes/MapasComBr:/var/www/html/protected/application/themes/MapasComBr - ../themes/MapasComBr:/var/www/html/protected/application/themes/MapasComBr
- ../plugins/AldirBlanc:/var/www/html/protected/application/plugins/AldirBlanc # - ../plugins/AldirBlanc:/var/www/html/protected/application/plugins/AldirBlanc
- ../../plugin-AldirBlanc:/var/www/html/protected/application/plugins/AldirBlanc
- ../plugins/AldirBlancDataprev:/var/www/html/protected/application/plugins/AldirBlancDataprev - ../plugins/AldirBlancDataprev:/var/www/html/protected/application/plugins/AldirBlancDataprev
- ../plugins/AldirBlancPreDataprev:/var/www/html/protected/application/plugins/AldirBlancPreDataprev - ../plugins/AldirBlancPreDataprev:/var/www/html/protected/application/plugins/AldirBlancPreDataprev
- ../plugins/AldirBlancRedirects:/var/www/html/protected/application/plugins/AldirBlancRedirects - ../plugins/AldirBlancRedirects:/var/www/html/protected/application/plugins/AldirBlancRedirects
- ../plugins/AldirBlancValidador:/var/www/html/protected/application/plugins/AldirBlancValidador - ../plugins/AldirBlancValidador:/var/www/html/protected/application/plugins/AldirBlancValidador
- ../plugins/AldirBlancValidadorFinanceiro:/var/www/html/protected/application/plugins/AldirBlancValidadorFinanceiro - ../plugins/AldirBlancValidadorFinanceiro:/var/www/html/protected/application/plugins/AldirBlancValidadorFinanceiro
- ../plugins/AldirBlancValidadorRecurso:/var/www/html/protected/application/plugins/AldirBlancValidadorRecurso - ../plugins/AldirBlancValidadorRecurso:/var/www/html/protected/application/plugins/AldirBlancValidadorRecurso
- ../../plugin-LocationPatch:/var/www/html/protected/application/plugins/LocationPatch
- ../../plugin-MapasNetwork:/var/www/html/protected/application/plugins/MapasNetwork
- ../plugins/MultipleLocalAuth:/var/www/html/protected/application/plugins/MultipleLocalAuth - ../plugins/MultipleLocalAuth:/var/www/html/protected/application/plugins/MultipleLocalAuth
- ../plugins/RegistrationPayments:/var/www/html/protected/application/plugins/RegistrationPayments - ../plugins/RegistrationPayments:/var/www/html/protected/application/plugins/RegistrationPayments
environment: environment:
- PENDING_PCACHE_RECREATION_INTERVAL=10 - PENDING_PCACHE_RECREATION_INTERVAL=10
- APP_MODE=development - APP_MODE=development
- STATUS_CREATE_AGENT=0
- CEP_TOKEN=b00d34334a57938e899f17f85b019615
- MAPS_USE_GOOGLE_GEOCODE=false
- MAPS_GOOGLE_API_KEY=AIzaSyDJd8Z7WEGcDVHeDXbn8hQnSXpIkthzabg
- LOCATION_PATCH_ENABLE=false
- LOCATION_PATCH_CUTOFF=20211101000000
#AIzaSyC_7muZJ1bYph65rGQG0e5RuPnkhVgKGok
depends_on: depends_on:
- db - db
...@@ -46,8 +61,8 @@ services: ...@@ -46,8 +61,8 @@ services:
ports: ports:
- "5432:5432" - "5432:5432"
volumes: volumes:
- ../compose/local/dump.sql:/docker-entrypoint-initdb.d/dump.sql - ../compose/local/pa-dump-2021-10-20--1438.sql:/docker-entrypoint-initdb.d/dump.sql
- ../docker-data/db-data:/var/lib/postgresql/data - ../docker-data/db-data:/var/lib/postgresql/data
volumes: volumes:
db-data: db-data:
\ No newline at end of file
Subproject commit 957bdafdb2c030364ee20a45c9fa5660145a2f5a Subproject commit 1a7311deaa2c15702dbaec37c4ac3f6bea296955
Subproject commit fa2876ff1d1b899afbeac5457ffbe23748c3810e Subproject commit fe3118029427c9c5ec77b1d1fd34a3675fc380d6
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment