From 7629d457c572be386145140ae24d981ea9f57dcc Mon Sep 17 00:00:00 2001 From: FORESTIER Fabien <fabien.forestier@soprasteria.com> Date: Tue, 22 May 2018 10:33:58 +0200 Subject: [PATCH] Edit gitlab-ci and nginx staging conf with the new host 'alpha.grandlyon.com' --- .gitlab-ci.yml | 4 ++-- nginx-staging.conf | 8 ++++---- readme.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8d221e7..8849252e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ deploy_development: - docker-compose --project-name data-reloaded-dev -f docker-compose-development.yml up -d environment: name: development - url: https://data-reloaded-dev.datalab.erasme.org + url: https://data-reloaded-dev.alpha.grandlyon.com build_staging: stage: build @@ -46,4 +46,4 @@ deploy_staging: - docker-compose --project-name data-reloaded-rec -f docker-compose-staging.yml up -d environment: name: staging - url: https://data-reloaded-rec.datalab.erasme.org \ No newline at end of file + url: https://data-reloaded-rec.alpha.grandlyon.com \ No newline at end of file diff --git a/nginx-staging.conf b/nginx-staging.conf index 388dec45..da5aa658 100644 --- a/nginx-staging.conf +++ b/nginx-staging.conf @@ -31,11 +31,11 @@ server { # Particular configuration to be able to call the elasticsearch service location /elasticsearch/ { #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-Forwarded-For $proxy_add_x_forwarded_for; #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-Credentials' 'true'; add_header 'Access-Control-Allow-Methods' 'GET, OPTIONS'; @@ -49,8 +49,8 @@ server { sub_filter_once off; 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.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.alpha.grandlyon.com/wordpress"; } } diff --git a/readme.md b/readme.md index 5b13b05f..21810901 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -[](https://gitlab.datalab.erasme.org/refonte-data/portail-data/commits/master) +[](https://gitlab.alpha.grandlyon.com/refonte-data/portail-data/commits/master) ## Requirements -- GitLab