Commit 0f7a357cbc964fa20b5258913e151d0b7f5b53f2

Authored by jonathan.brilhante
2 parents 9769c6cd d6814cc8
Exists in coppe

Adicionado os vídeos ao git

Merge branch 'coppe' of gitlab.lavid.ufpb.br:wikilibras/wikilibras-container into coppe

Conflicts:
	docker-compose.yml
docker-compose.yml
@@ -1,35 +0,0 @@ @@ -1,35 +0,0 @@
1 -version: '2'  
2 -  
3 -services:  
4 - web:  
5 - build:  
6 - context: .  
7 - args:  
8 - - IP=150.165.205.99  
9 - ports:  
10 - - "80:80"  
11 - - "18422"  
12 - - "5432"  
13 - - "6379"  
14 - - "27017"  
15 - - "200:200"  
16 - - "201:201"  
17 - - "8003:8003"  
18 - - "8001:8001"  
19 - - "8002:8002"  
20 - stdin_open: true  
21 - tty: true  
22 - volumes:  
23 - - /home/vlibras/container/wikilibrasdbapi/blender/  
24 - - /home/vlibras/container/wikilibrasdbapi/sinais/  
25 - - /home/vlibras/container/wikilibrasdbapi/avatar/  
26 - - /home/vlibras/container/wikilibrasdbapi/uploads/  
27 - - /var/log/apache2/  
28 - - /var/lib/mongodb/  
29 - - /home/vlibras/container/corretor_sinais/view/videos/  
30 - - /home/vlibras/container/validador_sinais/view/videos/  
31 - - /home/vlibras/container/wikilibrasV2/view/uploads/  
32 - - /home/vlibras/container/corretor_sinais/view/uploads/  
33 - - /home/vlibras/container/validador_sinais/view/uploads/  
34 - - /home/vlibras/container/taskmgr/events.log  
35 - - /home/vlibras/container/wikilibras-core/users/  
docker-compose.yml.example
@@ -24,7 +24,7 @@ services: @@ -24,7 +24,7 @@ services:
24 - /home/vlibras/container/wikilibrasdbapi/uploads/ 24 - /home/vlibras/container/wikilibrasdbapi/uploads/
25 - /var/log/apache2/ 25 - /var/log/apache2/
26 - /var/lib/mongodb/ 26 - /var/lib/mongodb/
27 - - /home/vlibras/container/wikilibrasV2/view/videos/ 27 + #- /home/vlibras/container/wikilibrasV2/view/videos/
28 - /home/vlibras/container/corretor_sinais/view/videos/ 28 - /home/vlibras/container/corretor_sinais/view/videos/
29 - /home/vlibras/container/validador_sinais/view/videos/ 29 - /home/vlibras/container/validador_sinais/view/videos/
30 - /home/vlibras/container/wikilibrasV2/view/uploads/ 30 - /home/vlibras/container/wikilibrasV2/view/uploads/
docker-compose.yml.template
@@ -24,7 +24,7 @@ services: @@ -24,7 +24,7 @@ services:
24 - /home/vlibras/container/wikilibrasdbapi/uploads/ 24 - /home/vlibras/container/wikilibrasdbapi/uploads/
25 - /var/log/apache2/ 25 - /var/log/apache2/
26 - /var/lib/mongodb/ 26 - /var/lib/mongodb/
27 - - /home/vlibras/container/wikilibrasV2/view/videos/ 27 + #- /home/vlibras/container/wikilibrasV2/view/videos/
28 - /home/vlibras/container/corretor_sinais/view/videos/ 28 - /home/vlibras/container/corretor_sinais/view/videos/
29 - /home/vlibras/container/validador_sinais/view/videos/ 29 - /home/vlibras/container/validador_sinais/view/videos/
30 - /home/vlibras/container/wikilibrasV2/view/uploads/ 30 - /home/vlibras/container/wikilibrasV2/view/uploads/
pybossa/settings_local.py.tmpl
@@ -87,14 +87,12 @@ PROFILES = [('Colaborador','Colaborador'), ('Animador','Animador 3D'), ('Especia @@ -87,14 +87,12 @@ PROFILES = [('Colaborador','Colaborador'), ('Animador','Animador 3D'), ('Especia
87 # LOG_LEVEL = logging.DEBUG 87 # LOG_LEVEL = logging.DEBUG
88 88
89 ## Mail setup 89 ## Mail setup
90 -MAIL_SERVER = 'localhost' 90 +MAIL_SERVER = 'relay.nuvem.gov.br'
91 MAIL_USERNAME = None 91 MAIL_USERNAME = None
92 MAIL_PASSWORD = None 92 MAIL_PASSWORD = None
93 MAIL_PORT = 25 93 MAIL_PORT = 25
94 MAIL_FAIL_SILENTLY = False 94 MAIL_FAIL_SILENTLY = False
95 -MAIL_DEFAULT_SENDER = 'PyBossa Support <info@pybossa.com>'  
96 -  
97 -## Announcement messages 95 +MAIL_DEFAULT_SENDER = 'Suporte Wikilibras <wikilibras@planejamento.gov.br>'
98 ## Use any combination of the next type of messages: root, user, and app owners 96 ## Use any combination of the next type of messages: root, user, and app owners
99 ## ANNOUNCEMENT = {'admin': 'Root Message', 'user': 'User Message', 'owner': 'Owner Message'} 97 ## ANNOUNCEMENT = {'admin': 'Root Message', 'user': 'User Message', 'owner': 'Owner Message'}
100 98
wikilibrasV2/view/videos/.gitkeep 0 → 100644
wikilibrasV2/view/videos/CALAR_REF.mp4 0 → 100755
No preview for this file type
wikilibrasV2/view/videos/CALAR_REF.webm 0 → 100755
No preview for this file type
wikilibrasV2/view/videos/ENSINADO_REF.mp4 0 → 100755
No preview for this file type
wikilibrasV2/view/videos/ENSINADO_REF.webm 0 → 100755
No preview for this file type
wikilibrasV2/view/videos/ENTANTO_REF.mp4 0 → 100755
No preview for this file type
wikilibrasV2/view/videos/ENTANTO_REF.webm 0 → 100755
No preview for this file type
wikilibrasV2/view/videos/ENTENDIDO_REF.mp4 0 → 100755
No preview for this file type
wikilibrasV2/view/videos/ENTENDIDO_REF.webm 0 → 100755
No preview for this file type