***

anatolicvs · Aug 4, 2020 · 40b6c04 · 40b6c04
1 parent dfbc6e2
commit 40b6c04
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/data.sql b/data.sql
@@ -69,7 +69,7 @@ CREATE TABLE IF NOT EXISTS policies (
     updatedAt timestamp
 );
 
-CREATE TABLE IF NOT EXISTS policy_field(
+CREATE TABLE IF NOT EXISTS policy_fields(
     id serial PRIMARY KEY, 
     policy_id integer,
     std_field_id integer, 
@@ -101,7 +101,8 @@ CREATE TABLE IF NOT EXISTS groups (
     updatedAt timestamp
 ); 
 
-CREATE TABLE IF NOT EXISTS groups_policy (
+CREATE TABLE IF NOT EXISTS groups_policies (
+    id serial PRIMARY KEY,
     group_id  integer,
     policy_id integer,
 
@@ -117,7 +118,8 @@ CREATE TABLE IF NOT EXISTS groups_policy (
     updatedAt timestamp
 ); 
 
-CREATE TABLE IF NOT EXISTS group_user (
+CREATE TABLE IF NOT EXISTS group_users (
+    id serial PRIMARY KEY,
     group_id  integer,
     user_id integer, 
 

diff --git a/portal/.env b/portal/.env
@@ -1,6 +1,6 @@
-REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/bas_insylva/portal/gatekeeper 
-REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/bas_insylva/portal/source-manager
-REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/bas_insylva/portal/keycloak
+REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/gatekeeper 
+REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/source-manager
+REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/keycloak
 REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app
 REACT_APP_IN_SYLVA_GRANT_TYPE=password
 REACT_APP_IN_SYLVA_REALM=in-sylva

diff --git a/portal/nginx/nginx.conf b/portal/nginx/nginx.conf
@@ -34,7 +34,7 @@ server {
 
   listen 3000;
   listen [::]:3000;
-  server_name w3.avignon.inra.fr/bas_insylva/portal/;  
+  server_name -;  
 
   proxy_set_header    Host               $host;
   proxy_set_header    X-Real-IP          $remote_addr;

diff --git a/search/.env b/search/.env
@@ -1,8 +1,8 @@
-REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/bas_insylva/search/gatekeeper 
-REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/bas_insylva/search/source-manager
-REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/bas_insylva/search/keycloak
-REACT_APP_IN_SYLVA_SEARCH_HOST=/bas_insylva/search/search-api
-REACT_APP_IN_SYLVA_LOGIN_HOST=http://w3.avignon.inra.fr/bas_insylva/login/
+REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/gatekeeper 
+REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/source-manager
+REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/keycloak
+REACT_APP_IN_SYLVA_SEARCH_HOST=/search-api
+REACT_APP_IN_SYLVA_LOGIN_HOST=http://localhost:8081
 REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app
 REACT_APP_IN_SYLVA_GRANT_TYPE=password
 REACT_APP_IN_SYLVA_REALM=in-sylva

diff --git a/search/nginx/nginx.conf b/search/nginx/nginx.conf
@@ -32,7 +32,7 @@ server {
 
   listen 3001;
   listen [::]:3001;
-  server_name w3.avignon.inra.fr/bas_insylva/search/;  
+  server_name -;  
 
   proxy_set_header    Host               $host;
   proxy_set_header    X-Real-IP          $remote_addr;