Skip to content
Snippets Groups Projects
Commit 7629d457 authored by FORESTIER Fabien's avatar FORESTIER Fabien
Browse files

Edit gitlab-ci and nginx staging conf with the new host 'alpha.grandlyon.com'

parent ec271b0d
Branches
No related tags found
No related merge requests found
Pipeline #
...@@ -29,7 +29,7 @@ deploy_development: ...@@ -29,7 +29,7 @@ deploy_development:
- docker-compose --project-name data-reloaded-dev -f docker-compose-development.yml up -d - docker-compose --project-name data-reloaded-dev -f docker-compose-development.yml up -d
environment: environment:
name: development name: development
url: https://data-reloaded-dev.datalab.erasme.org url: https://data-reloaded-dev.alpha.grandlyon.com
build_staging: build_staging:
stage: build stage: build
...@@ -46,4 +46,4 @@ deploy_staging: ...@@ -46,4 +46,4 @@ deploy_staging:
- docker-compose --project-name data-reloaded-rec -f docker-compose-staging.yml up -d - docker-compose --project-name data-reloaded-rec -f docker-compose-staging.yml up -d
environment: environment:
name: staging name: staging
url: https://data-reloaded-rec.datalab.erasme.org url: https://data-reloaded-rec.alpha.grandlyon.com
\ No newline at end of file \ No newline at end of file
...@@ -31,11 +31,11 @@ server { ...@@ -31,11 +31,11 @@ server {
# Particular configuration to be able to call the elasticsearch service # Particular configuration to be able to call the elasticsearch service
location /elasticsearch/ { location /elasticsearch/ {
#proxy_pass https://elastic2.recette.data.grandlyon.com/elastic/; #proxy_pass https://elastic2.recette.data.grandlyon.com/elastic/;
proxy_pass https://elastic.datalab.erasme.org/; proxy_pass https://elastic.alpha.grandlyon.com/;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
#proxy_set_header Host $http_host; #proxy_set_header Host $http_host;
proxy_set_header Host elastic.datalab.erasme.org; proxy_set_header Host elastic.alpha.grandlyon.com;
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Credentials' 'true'; add_header 'Access-Control-Allow-Credentials' 'true';
add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS';
...@@ -49,8 +49,8 @@ server { ...@@ -49,8 +49,8 @@ server {
sub_filter_once off; sub_filter_once off;
sub_filter_types *; sub_filter_types *;
sub_filter 'http:\/\/192.168.62.15:8000' 'https:\/\/data-reloaded-rec.datalab.erasme.org\/wordpress'; sub_filter 'http:\/\/192.168.62.15:8000' 'https:\/\/data-reloaded-rec.alpha.grandlyon.com\/wordpress';
sub_filter "http://192.168.62.15:8000" "https://data-reloaded-rec.datalab.erasme.org/wordpress"; sub_filter "http://192.168.62.15:8000" "https://data-reloaded-rec.alpha.grandlyon.com/wordpress";
} }
} }
[![pipeline status](https://gitlab.datalab.erasme.org/refonte-data/portail-data/badges/master/pipeline.svg)](https://gitlab.datalab.erasme.org/refonte-data/portail-data/commits/master) [![pipeline status](https://gitlab.alpha.grandlyon.com/refonte-data/portail-data/badges/master/pipeline.svg)](https://gitlab.alpha.grandlyon.com/refonte-data/portail-data/commits/master)
## Requirements ## Requirements
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment