Skip to content

Commit 79ef33d

Browse files
committed
minor fixes
1 parent ad2ddeb commit 79ef33d

File tree

3 files changed

+48
-73
lines changed

3 files changed

+48
-73
lines changed

compose/production/nginx/default.conf

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -93,28 +93,27 @@ server {
9393

9494

9595
location = /auth_hips {
96-
internal;
97-
98-
include uwsgi_params;
99-
uwsgi_param HTTP_X_ORIGINAL_URI $request_uri;
100-
uwsgi_param Cookie $http_cookie;
96+
internal;
10197

98+
include uwsgi_params;
99+
uwsgi_param HTTP_X_ORIGINAL_URI $request_uri;
100+
uwsgi_param Cookie $http_cookie;
102101

103-
uwsgi_param SCRIPT_NAME "";
104-
uwsgi_param PATH_INFO /api/nginx_serve_protected_hips/;
105102

106-
uwsgi_pass backend_srv;
103+
uwsgi_param SCRIPT_NAME "";
104+
uwsgi_param PATH_INFO /api/nginx_serve_protected_hips/;
107105

108-
# Ativa cache do resultado da autenticação
109-
proxy_cache auth_cache;
110-
proxy_cache_valid 200 10s;
111-
proxy_cache_valid 403 10s;
112-
proxy_cache_valid 401 10s;
106+
uwsgi_pass backend_srv;
113107

114-
# Garante que erros inesperados não sejam cacheados
115-
proxy_cache_valid any 1s;
108+
# Ativa cache do resultado da autenticação
109+
proxy_cache auth_cache;
110+
proxy_cache_valid 200 10s;
111+
proxy_cache_valid 403 10s;
112+
proxy_cache_valid 401 10s;
116113

117-
114+
# Garante que erros inesperados não sejam cacheados
115+
proxy_cache_valid any 1s;
116+
118117
}
119118

120119

docker-compose.production.yml

Lines changed: 32 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,75 +9,51 @@ volumes:
99

1010

1111
services:
12-
django: &django
13-
build:
14-
context: .
15-
dockerfile: ./compose/production/django/Dockerfile
16-
17-
image: sky_viewer_production_django
12+
backend: &django
13+
image: linea/skyviewer:backend_${IMAGE_TAG:-latest}
14+
#image: linea/skyviewer:backend_teste
15+
#user: "50017:1000"
16+
group_add:
17+
- "10000"
18+
- "39215"
19+
- "10006"
1820
volumes:
19-
- production_django_media:/app/sky_viewer/media
21+
- ./data/tmp:/data
22+
- ./logs:/logs
23+
- ./certificates:/app/config/certificates
2024
depends_on:
2125
- postgres
2226
- redis
2327
env_file:
24-
- ./.envs/.production/.django
25-
- ./.envs/.production/.postgres
28+
- .env
2629
command: /start
2730

31+
frontend:
32+
#image: linea/skyviewer:frontend_teste2
33+
image: linea/skyviewer:frontend_${IMAGE_TAG:-latest}
34+
depends_on:
35+
- backend
36+
2837
postgres:
29-
build:
30-
context: .
31-
dockerfile: ./compose/production/postgres/Dockerfile
32-
image: sky_viewer_production_postgres
38+
image: docker.io/postgres:14
3339
volumes:
34-
- production_postgres_data:/var/lib/postgresql/data
35-
- production_postgres_data_backups:/backups
40+
- ./pg_data:/var/lib/postgresql/data
41+
- ./pg_data:/backups
3642
env_file:
37-
- ./.envs/.production/.postgres
38-
39-
traefik:
40-
build:
41-
context: .
42-
dockerfile: ./compose/production/traefik/Dockerfile
43-
image: sky_viewer_production_traefik
44-
depends_on:
45-
- django
46-
volumes:
47-
- production_traefik:/etc/traefik/acme
48-
ports:
49-
- '0.0.0.0:80:80'
50-
- '0.0.0.0:443:443'
51-
- '0.0.0.0:5555:5555'
43+
- .env
5244

5345
redis:
5446
image: docker.io/redis:6
55-
5647
volumes:
57-
- production_redis_data:/data
58-
59-
60-
celeryworker:
61-
<<: *django
62-
image: sky_viewer_production_celeryworker
63-
command: /start-celeryworker
64-
65-
celerybeat:
66-
<<: *django
67-
image: sky_viewer_production_celerybeat
68-
command: /start-celerybeat
69-
70-
flower:
71-
<<: *django
72-
image: sky_viewer_production_flower
73-
command: /start-flower
74-
48+
- ./data/redis:/data
7549
nginx:
76-
build:
77-
context: .
78-
dockerfile: ./compose/production/nginx/Dockerfile
79-
image: sky_viewer_production_nginx
80-
depends_on:
81-
- django
50+
image: nginx:latest
51+
ports:
52+
- 8187:80
8253
volumes:
83-
- production_django_media:/usr/share/nginx/media:ro
54+
# Arquivo de configuração do Ngnix para este amente
55+
- ./nginx-proxy.conf:/etc/nginx/conf.d/default.conf:ro
56+
# Diretório onde o backend manipula arquivos, e que deve ficar acessivel ao servidor web.
57+
- ./data/tmp:/var/www/data
58+
# LSST DP02 Hips Images (PRIVATE)
59+
- /mnt/cl/lsst/dp02/secondary/images/hips:/var/www/data/releases/lsst/dp02/images/hips

frontend/components/Aladin/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default function Aladin({ userGroups = [] }) {
1212
aladinParams={{
1313
fov: 1.5,
1414
// target: "04 08 35.53 -37 06 27.6", // Coordenadas DES.
15-
target: "12 24 00.54 +07 30 11.9",
15+
target: "12 26 53.27 +08 56 49.0",
1616
projection: "AIT",
1717
showGotoControl: true,
1818
showFullscreenControl: true,

0 commit comments

Comments
 (0)