##// END OF EJS Templates
Probando RController 1/?
Renato-TUF -
r369:e24063c0558c
parent child
Show More
@@ -561,11 +561,11 class RCConfiguration(Configuration):
561 561 else:
562 562 data = {'manual': [clock.multiplier, clock.divisor, clock.reference]}
563 563 payload = self.request('setfreq', 'post', data=json.dumps(data))
564 if payload['setfreq'] != 'ok':
565 self.message = 'RC write: {}'.format(payload['setfreq'])
564 if payload['command'] != 'ok':
565 self.message = 'RC write: {}'.format(payload['command'])
566 566 else:
567 self.message = payload['setfreq']
568 if payload['setfreq'] == 'fail':
567 self.message = payload['programming']
568 if payload['programming'] == 'fail':
569 569 self.message = 'RC write: error programming CGS chip'
570 570
571 571 values = []
@@ -1,28 +1,28
1 1 version: '2'
2 2 services:
3 3 # Django app
4 # web:
5 # container_name: 'radarsys'
6 # build: .
7 # restart: always
8 # image: radarsys
9 # command: gunicorn radarsys.wsgi:application -w 2 -b :8000
10 # #command: python manage.py runserver 0.0.0.0:8030
4 web:
5 container_name: 'radarsys'
6 build: .
7 restart: always
8 image: radarsys
9 command: gunicorn radarsys.wsgi:application -w 2 -b :8000
10 #command: python manage.py runserver 0.0.0.0:8000
11 ports:
12 - 8000:8000
11 13 # ports:
12 # - 8000:8000
13 # #ports:
14 # # - 8030:8030
15 # env_file: .env
14 # - 8030:8030
15 env_file: .env
16 16
17 # links:
18 # # - redis
19 # - postgres
20 # volumes:
21 # - './:/radarsys'
22 # - '${DOCKER_DATA}/static:/radarsys/static'
23 # depends_on:
24 # # - redis
25 # - postgres
17 links:
18 # - redis
19 - postgres
20 volumes:
21 - './:/radarsys'
22 - '${DOCKER_DATA}/static:/radarsys/static'
23 depends_on:
24 # - redis
25 - postgres
26 26
27 27 # redis:
28 28 # container_name: 'radarsys-redis'
@@ -55,19 +55,19 services:
55 55 - POSTGRES_DB=radarsys
56 56 env_file: .env
57 57
58 # #Web Server
59 # nginx:
60 # container_name: 'radarsys-nginx'
61 # restart: always
62 # build: ./nginx/
63 # ports:
64 # - '8030:8030'
65 # volumes_from:
66 # - web
67 # links:
68 # - web:web
69 # depends_on:
70 # - web
58 #Web Server
59 nginx:
60 container_name: 'radarsys-nginx'
61 restart: always
62 build: ./nginx/
63 ports:
64 - '8030:8030'
65 volumes_from:
66 - web
67 links:
68 - web:web
69 depends_on:
70 - web
71 71
72 72 volumes:
73 73 pgdata:
@@ -1,3 +1,3
1 FROM nginx:1.13.8-alpine
1 FROM nginx:1.22.1-alpine
2 2 RUN rm /etc/nginx/conf.d/default.conf
3 3 ADD sites-enabled/radarsys.conf /etc/nginx/conf.d/
@@ -11,7 +11,10 server {
11 11 }
12 12
13 13 location / {
14 proxy_set_header Host "localhost";
14 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 }
@@ -26,6 +26,11 DEBUG = True
26 26
27 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 34 # Application definition
30 35
31 36 INSTALLED_APPS = [
General Comments 0
You need to be logged in to leave comments. Login now