update for deployment

Signed-off-by: SammyOina <[email protected]>

.gitignore

@@ -20,8 +20,6 @@
 # Go workspace file
 go.work
 
-.env
-
 /build
 
 *.cov

docker/.env

@@ -0,0 +1,10 @@
+MF_CALLHOME_LOG_LEVEL="debug"
+MF_JAEGER_URL="localhost:6831"
+MF_CALLHOME_IP_DB="IP2LOCATION-LITE-DB5.BIN"
+MF_CALLHOME_TIMESCALE_HOST="timescaledb"
+MF_CALLHOME_TIMESCALE_PORT=5432
+MF_CALLHOME_TIMESCALE_USER="mainflux"
+MF_CALLHOME_TIMESCALE_PASSWORD="mainflux"
+MF_CALLHOME_TIMESCALE_DB_NAME="mainflux"
+MF_CALLHOME_RELEASE_TAG="latest"
+MF_CALLHOME_PORT=8855

docker/certbot/init-letsencrypt.sh

@@ -5,7 +5,7 @@ if ! [ -x "$(command -v docker compose)" ]; then
   exit 1
 fi
 
-domains=(callhome.mainflux.com www.callhome.mainflux.com)
+domains=(deployments.mainflux.io www.deployments.mainflux.io)
 rsa_key_size=4096
 data_path="./certbot"
 email="[email protected]"

docker/nginx/nginx.conf

@@ -6,6 +6,9 @@ http{
     upstream callome_server {
         server callhome-server:8855;
     }
+    upstream callhome_ui {
+        server callhome-ui:80;
+    }
 
     map $http_apikey  $mf_version{
         "77e04a7c-f207-40dd-8950-c344871fd516" "0.13";
@@ -16,7 +19,7 @@ http{
 
     server {
         listen 80;
-        location / {
+        location /telemetry {
             if ($request_method = OPTIONS) {
                 add_header Access-Control-Allow-Origin '*';
                 add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
@@ -28,11 +31,14 @@ http{
             add_header Access-Control-Allow-Origin '*';
             add_header Access-Control-Allow-Methods '*';
             add_header Access-Control-Allow-Headers '*';
-            return 307 https://$host$request_uri;
+            return 301 https://$host$request_uri;
         }
         location /.well-known/acme-challenge/ {
             root /var/www/certbot;
         }
+        location / {
+            return 301 https://$host$request_uri;
+        }
     }
 
     server {
@@ -47,7 +53,7 @@ http{
             }
             return 204;
         }
-        location / {
+        location /telemetry {
             if ($request_method = OPTIONS) {
                 add_header Access-Control-Allow-Origin '*';
                 add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
@@ -64,6 +70,9 @@ http{
             limit_req_status 429;
             proxy_pass http://callome_server;
         }
+        location / {
+            proxy_pass http://callhome_ui;
+        }
         ssl_certificate /etc/letsencrypt/live/callhome.mainflux.com/fullchain.pem;
         ssl_certificate_key /etc/letsencrypt/live/callhome.mainflux.com/privkey.pem;
     }

frontend/src/environments/environment.prod.ts

@@ -1,6 +1,6 @@
 export const environment = {
   production: false,
   apiKey: '77e04a7c-f207-40dd-8950-c344871fd516',
-  callHomeBaseUrl: "http://64.226.105.108"
+  callHomeBaseUrl: "https://deployments.mainflux.io"
 };