Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
Renato-TUF
- Wed, 01 Feb 2023 18:56:42
Show More
0
apps/rc/models.py
+4
-4
@@
-561,11
+561,11
class RCConfiguration(Configuration):
561
else :
561
else :
562
data = { 'manual' : [ clock . multiplier , clock . divisor , clock . reference ]}
562
data = { 'manual' : [ clock . multiplier , clock . divisor , clock . reference ]}
563
payload = self . request ( 'setfreq' , 'post' , data = json . dumps ( data ))
563
payload = self . request ( 'setfreq' , 'post' , data = json . dumps ( data ))
564
if payload [ 'setfreq' ] != 'ok' :
564
if payload [ 'command ' ] != 'ok' :
565
self . message = 'RC write: {}' . format ( payload [ 'setfreq' ])
565
self . message = 'RC write: {}' . format ( payload [ 'command ' ])
566
else :
566
else :
567
self . message = payload [ 'setfreq' ]
567
self . message = payload [ 'programming ' ]
568
if payload [ 'setfreq' ] == 'fail' :
568
if payload [ 'programming ' ] == 'fail' :
569
self . message = 'RC write: error programming CGS chip'
569
self . message = 'RC write: error programming CGS chip'
570
570
571
values = []
571
values = []
0
docker-compose.yml
+34
-34
@@
-1,28
+1,28
1
version : '2'
1
version : '2'
2
services :
2
services :
3
# Django app
3
# Django app
4
# web:
4
web :
5
# container_name: 'radarsys'
5
container_name : 'radarsys'
6
# build: .
6
build : .
7
# restart: always
7
restart : always
8
# image: radarsys
8
image : radarsys
9
# command: gunicorn radarsys.wsgi:application -w 2 -b :8000
9
command : gunicorn radarsys.wsgi:application -w 2 -b :8000
10
# #command: python manage.py runserver 0.0.0.0:8030
10
#command: python manage.py runserver 0.0.0.0:800 0
11
# ports:
11
ports :
12
# - 8000:8000
12
- 8000:8000
13
# #ports:
13
#ports:
14
# # - 8030:8030
14
# - 8030:8030
15
# env_file: .env
15
env_file : .env
16
16
17
# links:
17
links :
18
# # - redis
18
# - redis
19
# - postgres
19
- postgres
20
# volumes:
20
volumes :
21
# - './:/radarsys'
21
- './:/radarsys'
22
# - '${DOCKER_DATA}/static:/radarsys/static'
22
- '${DOCKER_DATA}/static:/radarsys/static'
23
# depends_on:
23
depends_on :
24
# # - redis
24
# - redis
25
# - postgres
25
- postgres
26
26
27
# redis:
27
# redis:
28
# container_name: 'radarsys-redis'
28
# container_name: 'radarsys-redis'
@@
-55,19
+55,19
services:
55
- POSTGRES_DB=radarsys
55
- POSTGRES_DB=radarsys
56
env_file : .env
56
env_file : .env
57
57
58
# #Web Server
58
#Web Server
59
# nginx:
59
nginx :
60
# container_name: 'radarsys-nginx'
60
container_name : 'radarsys-nginx'
61
# restart: always
61
restart : always
62
# build: ./nginx/
62
build : ./nginx/
63
# ports:
63
ports :
64
# - '8030:8030'
64
- '8030:8030'
65
# volumes_from:
65
volumes_from :
66
# - web
66
- web
67
# links:
67
links :
68
# - web:web
68
- web:web
69
# depends_on:
69
depends_on :
70
# - web
70
- web
71
71
72
volumes :
72
volumes :
73
pgdata :
73
pgdata :
0
nginx/Dockerfile
+1
-1
@@
-1,3
+1,3
1
FROM nginx:1.13.8-alpine
1
FROM nginx:1.22.1 -alpine
2
RUN rm /etc/nginx/conf.d/default.conf
2
RUN rm /etc/nginx/conf.d/default.conf
3
ADD sites-enabled/radarsys.conf /etc/nginx/conf.d/
3
ADD sites-enabled/radarsys.conf /etc/nginx/conf.d/
0
nginx/sites-enabled/radarsys.conf
+3
0
@@
-11,7
+11,10
server {
11
}
11
}
12
12
13
location / {
13
location / {
14
proxy_set_header Host "localhost";
14
proxy_pass http://web:8000;
15
proxy_pass http://web:8000;
16
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
17
15
}
18
}
16
19
17
}
20
}
0
radarsys/settings.py
+5
0
@@
-26,6
+26,11
DEBUG = True
26
26
27
ALLOWED_HOSTS = [ '*' ]
27
ALLOWED_HOSTS = [ '*' ]
28
28
29
CSRF_TRUSTED_ORIGINS = [
30
"http://*.localhost:8030"
31
]
32
#Si se requiere que la aplicación salga de este entorno, para otros usuarios es necesario hacer una API request https://fractalideas.com/blog/making-react-and-django-play-well-together-single-page-app-model/
33
29
# Application definition
34
# Application definition
30
35
31
INSTALLED_APPS = [
36
INSTALLED_APPS = [
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages
