Skip to content

Commit

Permalink
FI-2429: Disable inferno validator (#68)
Browse files Browse the repository at this point in the history
  • Loading branch information
dehall committed May 10, 2024
1 parent 6de3e25 commit d38c636
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 82 deletions.
58 changes: 29 additions & 29 deletions config/nginx.background.conf
Original file line number Diff line number Diff line change
Expand Up @@ -53,34 +53,34 @@ http {
# the server will close connections after this time
keepalive_timeout 600;

location /validator {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_redirect off;
proxy_set_header Connection '';
proxy_http_version 1.1;
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;

proxy_pass http://fhir_validator_app;
}

location /validatorapi/ {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_redirect off;
proxy_set_header Connection '';
proxy_http_version 1.1;
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;

proxy_pass http://validator_service:4567/;
}
# location /validator {
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header Host $http_host;
# proxy_set_header X-Forwarded-Proto $scheme;
# proxy_set_header X-Forwarded-Port $server_port;
# proxy_redirect off;
# proxy_set_header Connection '';
# proxy_http_version 1.1;
# chunked_transfer_encoding off;
# proxy_buffering off;
# proxy_cache off;
#
# proxy_pass http://fhir_validator_app;
# }
#
# location /validatorapi/ {
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header Host $http_host;
# proxy_set_header X-Forwarded-Proto $scheme;
# proxy_set_header X-Forwarded-Port $server_port;
# proxy_redirect off;
# proxy_set_header Connection '';
# proxy_http_version 1.1;
# chunked_transfer_encoding off;
# proxy_buffering off;
# proxy_cache off;
#
# proxy_pass http://validator_service:4567/;
# }
}
}
58 changes: 29 additions & 29 deletions config/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -68,34 +68,34 @@ http {
proxy_pass http://inferno:4567;
}

location /validator {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_redirect off;
proxy_set_header Connection '';
proxy_http_version 1.1;
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;

proxy_pass http://fhir_validator_app;
}

location /validatorapi/ {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_redirect off;
proxy_set_header Connection '';
proxy_http_version 1.1;
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;

proxy_pass http://validator_service:4567/;
}
# location /validator {
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header Host $http_host;
# proxy_set_header X-Forwarded-Proto $scheme;
# proxy_set_header X-Forwarded-Port $server_port;
# proxy_redirect off;
# proxy_set_header Connection '';
# proxy_http_version 1.1;
# chunked_transfer_encoding off;
# proxy_buffering off;
# proxy_cache off;
#
# proxy_pass http://fhir_validator_app;
# }
#
# location /validatorapi/ {
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header Host $http_host;
# proxy_set_header X-Forwarded-Proto $scheme;
# proxy_set_header X-Forwarded-Port $server_port;
# proxy_redirect off;
# proxy_set_header Connection '';
# proxy_http_version 1.1;
# chunked_transfer_encoding off;
# proxy_buffering off;
# proxy_cache off;
#
# proxy_pass http://validator_service:4567/;
# }
}
}
28 changes: 14 additions & 14 deletions docker-compose.background.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
version: '3'
services:
validator_service:
image: infernocommunity/fhir-validator-service
# Update this path to match your directory structure
volumes:
- ./lib/inferno_template/igs:/home/igs
fhir_validator_app:
image: infernocommunity/fhir-validator-app
depends_on:
- validator_service
environment:
EXTERNAL_VALIDATOR_URL: http://localhost/validatorapi
VALIDATOR_BASE_PATH: /validator
# validator_service:
# image: infernocommunity/fhir-validator-service
# # Update this path to match your directory structure
# volumes:
# - ./lib/inferno_template/igs:/home/igs
# fhir_validator_app:
# image: infernocommunity/fhir-validator-app
# depends_on:
# - validator_service
# environment:
# EXTERNAL_VALIDATOR_URL: http://localhost/validatorapi
# VALIDATOR_BASE_PATH: /validator
nginx:
image: nginx
volumes:
- ./config/nginx.background.conf:/etc/nginx/nginx.conf
ports:
- "80:80"
command: [nginx, '-g', 'daemon off;']
depends_on:
- fhir_validator_app
# depends_on:
# - fhir_validator_app
redis:
image: redis
ports:
Expand Down
20 changes: 10 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ services:
context: ./
volumes:
- ./data:/opt/inferno/data
depends_on:
- validator_service
# depends_on:
# - validator_service
worker:
build:
context: ./
Expand All @@ -15,14 +15,14 @@ services:
command: bundle exec sidekiq -r ./worker.rb
depends_on:
- redis
validator_service:
extends:
file: docker-compose.background.yml
service: validator_service
fhir_validator_app:
extends:
file: docker-compose.background.yml
service: fhir_validator_app
# validator_service:
# extends:
# file: docker-compose.background.yml
# service: validator_service
# fhir_validator_app:
# extends:
# file: docker-compose.background.yml
# service: fhir_validator_app
nginx:
extends:
file: docker-compose.background.yml
Expand Down

0 comments on commit d38c636

Please sign in to comment.