dev branch, don't merge with master without consideration with ozkan

anatolicvs · Jun 29, 2020 · 3121829 · 3121829
1 parent 5530f20
commit 3121829
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/data.sql b/data.sql
@@ -277,6 +277,9 @@ CREATE TABLE IF NOT EXISTS profile_specifications(
     updatedAt timestamp
 ); 
 
+\connect keycloak
+
+update REALM set ssl_required = 'NONE' where id = 'master';
 
 /*
 CREATE OR REPLACE FUNCTION func_role_updater() RETURNS TRIGGER AS $BODY$

diff --git a/elasticsearch.yml b/elasticsearch.yml
@@ -1,4 +1,4 @@
-# opendistro_security.disabled: true
+opendistro_security.disabled: true
 opendistro_security.ssl.transport.pemcert_filepath: node.pem
 opendistro_security.ssl.transport.pemkey_filepath: node-key.pem
 opendistro_security.ssl.transport.pemtrustedcas_filepath: root-ca.pem

diff --git a/portal/Dockerfile b/portal/Dockerfile
@@ -40,7 +40,7 @@ RUN yarn build
 # production environment
 FROM nginx:1.18.0
 
-RUN apt-get update && apt-get install wget -y && apt-get install telnet -y
+RUN apt-get update && apt-get install wget -y && apt-get install telnet -y && apt-get install vim -y
 
 RUN apt-get install iputils-ping -y
 
@@ -51,7 +51,7 @@ RUN apt-get install curl gnupg2 ca-certificates lsb-release -y
 RUN echo "deb http://nginx.org/packages/debian `lsb_release -cs` nginx" \
     | tee /etc/apt/sources.list.d/nginx.list
 RUN echo "deb http://nginx.org/packages/mainline/debian `lsb_release -cs` nginx" \
-    | tee /etc/apt/sources.list.d/nginx.list
+   | tee /etc/apt/sources.list.d/nginx.list
 
 RUN curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add -
 

diff --git a/portal/nginx/nginx.conf b/portal/nginx/nginx.conf
@@ -3,7 +3,7 @@
 # load_module modules/ngx_stream_js_module.so;
 # load_module modules/ngx_http_geoip_module.so;
 
-resolver 127.0.0.1 [::];
+# resolver 127.0.0.1 [::];
 
 upstream backend_gatekeeper {
   hash $remote_addr$remote_port consistent;
@@ -24,10 +24,12 @@ upstream backend_source_manager {
 }
 
 
+include /etc/nginx/mime.types; 
+
 server {
   # load_module modules/ngx_http_geoip_module.so;
 
-  include    /etc/nginx/mime.types;
+  # include    /etc/nginx/mime.types;
   # js_include hello_world.js;
 
   listen 3000;

diff --git a/search/nginx/nginx.conf b/search/nginx/nginx.conf
@@ -26,11 +26,13 @@ upstream backend_search {
   server search-api:9001;
 }
 
+include /etc/nginx/mime.types;
+
 server {
 
   listen 3001;
   listen [::]:3001;
-  server_name w3.avignon.inra.fr/bas_insylva/search/;  
+  server_name w3.avignon.inra.fr/bas_insylva//search/;  
 
   proxy_set_header    Host               $host;
   proxy_set_header    X-Real-IP          $remote_addr;
@@ -88,9 +90,10 @@ server {
      sub_filter_once off;
      proxy_set_header Accept-Encoding "";
   }
-
-  location /bas_insylva/search/ {
-
+  #location ~* /static/media/* {
+  #  try_files $uri /bas_insylva/search/static/media/;
+  #}
+  location / {
       # include    /etc/nginx/mime.types;
       # if ($arg_token ~ "^$") { return 404; }