Skip to content

GitLab

Commit 42158a19 authored by Rafael Chaves Freitas's avatar Rafael Chaves Freitas
Browse files

Merge branch 'refactor' into develop

parents e55e9a86 680fc36f
Pipeline #7274 failed with stages
in 3 minutes and 56 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 462113 additions and 200 deletions
.gitlab-ci.yml
View file @ 42158a19
......@@ -17,8 +17,8 @@ build to homolog:
stage: build
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull hacklab/mapasculturais:develop
- docker build -t $HOMOLOG_IMAGE -f compose/Dockerfile .
- docker pull mapasculturais/mapasculturais:develop
- docker build -t $HOMOLOG_IMAGE -f compose/production/Dockerfile .
- docker push $HOMOLOG_IMAGE
only:
- /master/
......@@ -43,8 +43,8 @@ build to production:
stage: build
script:
- docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
- docker pull hacklab/mapasculturais:develop
- docker build -t $RELEASE_IMAGE -f compose/Dockerfile .
- docker pull mapasculturais/mapasculturais:develop
- docker build -t $RELEASE_IMAGE -f compose/production/Dockerfile .
- docker tag $RELEASE_IMAGE "$CI_REGISTRY_IMAGE:latest"
- docker push $RELEASE_IMAGE
- docker push "$CI_REGISTRY_IMAGE:latest"
......
compose/Dockerfile deleted 100644 → 0
View file @ e55e9a86
FROM hacklab/mapasculturais:v4.4.1
RUN git clone https://github.com/LibreCoopUruguay/MultipleLocalAuth /var/www/html/protected/application/plugins/MultipleLocalAuth
RUN curl https://raw.githubusercontent.com/opauth/facebook/master/FacebookStrategy.php > /var/www/html/protected/application/plugins/MultipleLocalAuth/Facebook/FacebookStrategy.php
COPY compose/config.d /var/www/html/protected/application/conf/config.d
COPY conf/agent-types.php /var/www/html/protected/application/conf/agent-types.php
COPY conf/opportunity-types.php /var/www/html/protected/application/conf/opportunity-types.php
COPY conf/taxonomies.php /var/www/html/protected/application/conf/taxonomies.php
COPY translations/pt_BR.mo /var/www/html/protected/application/translations/pt_BR.mo
COPY translations/pt_BR.po /var/www/html/protected/application/translations/pt_BR.po
COPY translations/es_ES.mo /var/www/html/protected/application/translations/es_ES.mo
COPY translations/es_ES.po /var/www/html/protected/application/translations/es_ES.po
COPY themes/IberCulturaViva /var/www/html/protected/application/themes/IberCulturaViva
compose/common/config.d/0.main.php 0 → 100644
View file @ 42158a19
<?php
use MapasCulturais\i;
return [
'app.siteName' => env('SITE_NAME', 'Mapa IberCultura Viva'),
'app.siteDescription' => \MapasCulturais\i::__("O Mapa IberCultura Viva é a plataforma livre, gratuita e colaborativa de mapeamento do programa de cooperação IberCultura Viva. Neste espaço, representantes de organizações culturais comunitárias e povos originários podem se registrar como agentes culturais, difundir eventos, cadastrar projetos e inscrever-se nos editais e concursos publicados.<br/><br/>
A informação coletada pelo Mapa IberCultura Viva será utilizada para a construção/consolidação de indicadores culturais que fortalecerão os sistemas de informação cultural dos países membros do programa (Argentina, Brasil, Chile, Costa Rica, El Salvador, Equador, Espanha, Guatemala, México, Peru e Uruguai)."),
'themes.active' => env('ACTIVE_THEME', 'IberCulturaViva'),
'app.lcode' => env('APP_LCODE', 'es_ES,pt_BR'),
'namespaces' => array(
'MapasCulturais\Themes' => THEMES_PATH,
'MapasCulturais\Themes\BaseV1' => THEMES_PATH . 'BaseV1/',
'Subsite' => THEMES_PATH . 'Subsite/',
),
'doctrine.database' => [
'host' => env('DB_HOST', 'db'),
'dbname' => env('DB_NAME', 'mapas'),
'user' => env('DB_USER', 'mapas'),
'password' => env('DB_PASS', 'mapas'),
'server_version' => env('DB_VERSION', 10),
]
];
\ No newline at end of file
compose/config.d/plugins.php → compose/common/config.d/plugins.php
View file @ 42158a19
......@@ -2,9 +2,10 @@
return [
'plugins' => [
'MultipleLocalAuth' => [ 'namespace' => 'MultipleLocalAuth' ],
'EvaluationMethodTechnical' => ['namespace' => 'EvaluationMethodTechnical'],
'EvaluationMethodSimple' => ['namespace' => 'EvaluationMethodSimple'],
'EvaluationMethodDocumentary' => ['namespace' => 'EvaluationMethodDocumentary']
'EvaluationMethodDocumentary' => ['namespace' => 'EvaluationMethodDocumentary'],
'MultipleLocalAuth' => [ 'namespace' => 'MultipleLocalAuth' ]
]
];
compose/common/config.php 0 → 100644
View file @ 42158a19
<?php
define('APP_BASE_URL', (isset($_SERVER['HTTPS']) ? 'https://' : 'http://' ) . @$_SERVER['HTTP_HOST'] . '/');
$config = include 'conf-base.php';
foreach(['conf-common.d', 'config.d'] as $folder){
$config_files = glob(__DIR__ . "/{$folder}/*.php");
sort($config_files);
foreach($config_files as $config_file) {
$config = array_merge($config, include ($config_file) );
}
}
return $config;
\ No newline at end of file
compose/config.d/0.defaults.php deleted 100644 → 0
View file @ e55e9a86
<?php
define('APP_BASE_URL', (isset($_SERVER['HTTPS']) ? 'https://' : 'http://' ) . @$_SERVER['HTTP_HOST'] . '/');
switch(env('LOG_LEVEL', 'NOTICE')){
case 'ALERT':
$loglevel = \Slim\Log::ALERT;
break;
case 'CRITICAL':
$loglevel = \Slim\Log::CRITICAL;
break;
case 'DEBUG':
$loglevel = \Slim\Log::DEBUG;
break;
case 'EMERGENCY':
$loglevel = \Slim\Log::EMERGENCY;
break;
case 'ERROR':
$loglevel = \Slim\Log::ERROR;
break;
case 'FATAL':
$loglevel = \Slim\Log::FATAL;
break;
case 'INFO':
$loglevel = \Slim\Log::INFO;
break;
case 'NOTICE':
$loglevel = \Slim\Log::NOTICE;
break;
case 'WARN':
$loglevel = \Slim\Log::WARN;
break;
default:
$loglevel = \Slim\Log::NOTICE;
break;
}
return [
'app.siteName' => env('SITE_NAME', 'Mapa IberCultura Viva'),
'app.siteDescription' => \MapasCulturais\i::__("O Mapa IberCultura Viva é a plataforma livre, gratuita e colaborativa de mapeamento do programa de cooperação IberCultura Viva. Neste espaço, representantes de organizações culturais comunitárias e povos originários podem se registrar como agentes culturais, difundir eventos, cadastrar projetos e inscrever-se nos editais e concursos publicados.<br/><br/>
A informação coletada pelo Mapa IberCultura Viva será utilizada para a construção/consolidação de indicadores culturais que fortalecerão os sistemas de informação cultural dos países membros do programa (Argentina, Brasil, Chile, Costa Rica, El Salvador, Equador, Espanha, Guatemala, México, Peru e Uruguai)."),
'themes.active' => env('ACTIVE_THEME', 'MapasCulturais\Themes\BaseV1'),
'app.lcode' => env('APP_LCODE', 'es_ES,pt_BR'),
'namespaces' => array(
'MapasCulturais\Themes' => THEMES_PATH,
'MapasCulturais\Themes\BaseV1' => THEMES_PATH . 'BaseV1/',
'Subsite' => THEMES_PATH . 'Subsite/',
),
// APP MODE
'app.mode' => env('APP_MODE', 'production'),
'doctrine.isDev' => env('DOCRINE_ISDEV', false),
'slim.debug' => env('SLIM_DEBUG', false),
// DATABASE
'doctrine.database' => [
'dbname' => env('DB_NAME', 'mapas'),
'user' => env('DB_USER', 'mapas'),
'host' => env('DB_HOST', 'db'),
'password' => env('DB_PASS', 'mapas'),
'server_version' => 10.0,
],
// MAILER
'mailer.user' => env('MAILER_USER', "admin@mapasculturais.org"),
'mailer.psw' => env('MAILER_PASS', "password"),
'mailer.protocol' => env('MAILER_PROTOCOL', 'ssl'),
'mailer.server' => env('MAILER_SERVER', 'localhost'),
'mailer.port' => env('MAILER_PORT', '465'),
'mailer.from' => env('MAILER_FROM', 'suporte@mapasculturais.org'),
'mailer.alwaysTo' => env('MAILER_ALWAYSTO', false),
// MAP
'maps.center' => [-5, -30],
'maps.zoom.default' => env('MAPS_ZOOM_DEFAULTS', 3),
'maps.zoom.approximate' => env('MAPS_ZOOM_APPROXIMATE', 14),
'maps.zoom.precise' => env('MAPS_ZOOM_PRECISE', 16),
'maps.zoom.max' => env('MAPS_ZOOM_MAX', 18),
'maps.zoom.min' => env('MAPS_ZOOM_MIN', 3),
'maps.includeGoogleLayers' => env('MAPS_INCLUDE_GOOGLE_LAYERS', false),
// CEP API
'cep.endpoint' => env('CEP_ENDPOINT', 'http://www.cepaberto.com/api/v2/ceps.json?cep=%s'),
'cep.token_header' => env('CEP_TOKEN_HEADER', 'Authorization: Token token="%s"'),
'cep.token' => env('CEP_TOKEN', ''),
// LOG
'slim.log.level' => $loglevel,
'slim.log.enabled' => env('LOG_ENABLED', false),
'app.log.path' => env('LOG_PATH', realpath(BASE_PATH . '..') . '/logs/'),
'app.log.query' => env('LOG_QUERY', false),
'app.log.hook' => env('LOG_HOOK', false),
'app.log.requestData' => env('LOG_REQUESTDATA', false),
'app.log.translations' => env('LOG_TRANSLATIONS', false),
'app.log.apiCache' => env('LOG_APICACHE', false),
'app.log.apiDql' => env('LOG_APIDQL', false),
'app.log.assets' => env('LOG_ASSETS', false),
'app.useGoogleGeocode' => true,
'app.googleApiKey' => env('GOOGLE_GEOCODING_API_KEY', ''),
];
compose/config.d/1.asset-manager.php deleted 100644 → 0
View file @ e55e9a86
<?php
$app_mode = env('APP_MODE', 'production');
$is_production = $app_mode == 'production';
return [
'themes.assetManager' => new \MapasCulturais\AssetManagers\FileSystem(array(
'publishPath' => BASE_PATH . 'assets/',
'mergeScripts' => false,
'mergeStyles' => $is_production,
'process.js' => true ?
'cp {IN} {OUT}':
'uglifyjs {IN} -o {OUT} --source-map {OUT}.map --source-map-include-sources --source-map-url /assets/{FILENAME}.map -b -p ' . substr_count(BASE_PATH, '/'),
'process.css' => !$is_production ?
'cp {IN} {OUT}':
'uglifycss {IN} > {OUT}',
'publishFolderCommand' => 'cp -R {IN} {PUBLISH_PATH}{FILENAME}'
)),
];
\ No newline at end of file
compose/entrypoint.sh deleted 100755 → 0
View file @ e55e9a86
#!/bin/bash
set -e
if [ ! -f /.deployed ]; then
cd /var/www/scripts
./deploy.sh
touch /.deployed
fi
exec "$@"
compose/local/Dockerfile 0 → 100644
View file @ 42158a19
FROM mapasculturais/mapasculturais:develop-cli
RUN git clone https://github.com/hacklabr/mapasculturais-multipleLocalAuth /var/www/html/protected/application/plugins/MultipleLocalAuth
RUN curl https://raw.githubusercontent.com/opauth/facebook/master/FacebookStrategy.php > /var/www/html/protected/application/plugins/MultipleLocalAuth/Facebook/FacebookStrategy.php
COPY compose/common/config.php /var/www/html/protected/application/conf/config.php
\ No newline at end of file
compose/local/config.d/dev.php 0 → 100644
View file @ 42158a19
<?php
return [
'doctrine.isDev' => false,
// LOG --------------------
'slim.log.level' => \Slim\Log::DEBUG,
'slim.log.enabled' => true,
// app.log.hook aceita regex para filtrar quais hooks são exibidos no output,
// ex: "panel", "^template", "template\(site\.index\.*\):before"
'app.log.hook' => false,
// 'app.log.query' => true,
// 'app.log.requestData' => true,
// 'app.log.translations' => true,
// 'app.log.apiCache' => true,
// 'app.log.apiDql' => true,
// 'app.log.assets' => true,
// MAILER -----------------
'mailer.user' => 'oseias@hacklab.com.br',
'mailer.psw' => '6oeLiiAopx',
'mailer.protocol' => 'SSL',
'mailer.server' => 'smtp.gmail.com',
'mailer.port' => '465',
'mailer.from' => 'mapas@local',
'mailer.alwaysTo' => 'rafael@hacklab.com.br', // todos os emails serão enviados para este endereço
// AUTH -------------------
// 'auth.provider' => 'Fake',
'auth.provider' => '\MultipleLocalAuth\Provider',
'auth.debug' => true,
'auth.config' => array(
'salt' => env('AUTH_SALT', null),
'timeout' => '24 hours',
'debug' => true,
'strategies' => [
'Facebook' => array(
'app_id' => 123123123,//env('AUTH_FACEBOOK_APP_ID', null),
'app_secret' => env('AUTH_FACEBOOK_APP_SECRET', null),
'scope' => env('AUTH_FACEBOOK_SCOPE', 'email'),
),
'LinkedIn' => array(
'api_key' => env('AUTH_LINKEDIN_API_KEY', null),
'secret_key' => env('AUTH_LINKEDIN_SECRET_KEY', null),
'redirect_uri' => '/autenticacao/linkedin/oauth2callback',
'scope' => env('AUTH_LINKEDIN_SCOPE', 'r_emailaddress')
),
'Google' => array(
'client_id' => env('AUTH_GOOGLE_CLIENT_ID', null),
'client_secret' => env('AUTH_GOOGLE_CLIENT_SECRET', null),
'redirect_uri' => '/autenticacao/google/oauth2callback',
'scope' => env('AUTH_GOOGLE_SCOPE', 'email'),
),
'Twitter' => array(
'app_id' => env('AUTH_TWITTER_APP_ID', null),
'app_secret' => env('AUTH_TWITTER_APP_SECRET', null),
),
]
)
];
\ No newline at end of file
compose/local/db/dump.sql 0 → 100644
View file @ 42158a19
This diff is collapsed.
db/initial-data.sql → compose/local/db/initial-data.sql
View file @ 42158a19
File moved
db/schema.sql → compose/local/db/schema.sql
View file @ 42158a19
File moved
compose/local/php.ini deleted 100644 → 0
View file @ e55e9a86
log_errors = On
error_log = /dev/stderr
error_reportion = E_ALL ^ E_STRICT
display_errors = On
\ No newline at end of file
compose/nginx.conf deleted 100644 → 0
View file @ e55e9a86
server {
index index.php index.html;
error_log /var/log/nginx/error.log;
access_log /var/log/nginx/access.log;
root /var/www/html;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~ /files/.*\.php$ {
deny all;
return 403;
}
location ~ /asset/.*\.php$ {
deny all;
return 403;
}
location ~* \.(js|css|png|jpg|jpeg|gif|ico|woff)$ {
expires 1w;
log_not_found off;
}
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass mapas:9000;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
}
charset utf-8;
}
\ No newline at end of file
compose/production/Dockerfile 0 → 100644
View file @ 42158a19
FROM mapasculturais/mapasculturais:develop
RUN git clone https://github.com/hacklabr/mapasculturais-multipleLocalAuth /var/www/html/protected/application/plugins/MultipleLocalAuth
RUN curl https://raw.githubusercontent.com/opauth/facebook/master/FacebookStrategy.php > /var/www/html/protected/application/plugins/MultipleLocalAuth/Facebook/FacebookStrategy.php
COPY compose/common/config.php /var/www/html/protected/application/conf/config.php
COPY compose/common/config.d /var/www/html/protected/application/conf/conf-common.d
COPY compose/production/config.d /var/www/html/protected/application/conf/config.d
COPY themes /var/www/html/protected/application/themes
COPY plugins /var/www/html/protected/application/plugins
compose/production/config.d/.gitkeep 0 → 100644
View file @ 42158a19
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