refactor: nginx

api/src/config/index.ts

@@ -121,7 +121,7 @@ export const config: Config = {
     email: {
       main: '[email protected]',
     },
-    appName: 'Hexabot.io',
+    appName: 'Hexabot.ai',
     apiUrl: 'http://localhost:4000',
     appUrl: 'http://localhost:8081',
     geocoder: {

api/src/extensions/channels/offline/__test__/events.mock.ts

@@ -16,7 +16,7 @@ import {
 import { Offline } from '../types';
 
 const img_url =
-  'http://demo.hexabot.io/attachment/download/5c334078e2c41d11206bd152/myimage.png';
+  'http://demo.hexabot.ai/attachment/download/5c334078e2c41d11206bd152/myimage.png';
 
 // Offline events
 const offlineEventPayload: Offline.Event = {

docker/.env.example

@@ -1,15 +1,12 @@
 # API & Common
 NODE_ENV=dev
+APP_DOMAIN=localhost
+SSL_EMAIL=[email protected]
 API_PORT=4000
-APP_MONGO_EXPRESS_PORT=9000
-APP_SMTP_4_DEV_PORT=9002
 APP_SCRIPT_COMPODOC_PORT=9003
-API_ORIGIN=http://localhost:4000
-FRONTEND_ORIGIN=http://localhost:8080,http://localhost:8081,http://localhost:5173,http://localhost,http://localhost/*,*
-MONGO_USER=dev_only
-MONGO_PASSWORD=dev_only
-MONGO_URI=mongodb://dev_only:dev_only@mongo:27017/
-MONGO_DB=hexabot
+NEXT_PUBLIC_API_ORIGIN=http://${APP_DOMAIN}:${API_PORT}
+API_ORIGIN=http://${APP_DOMAIN}:${API_PORT}
+FRONTEND_ORIGIN=http://${APP_DOMAIN}:8080,http://${APP_DOMAIN}:8081,http://${APP_DOMAIN}:5173,http://${APP_DOMAIN},http://${APP_DOMAIN}/*,*
 JWT_SECRET=dev_only
 JWT_EXPIRES_IN=60
 SALT_LENGTH=12
@@ -25,12 +22,22 @@ PASSWORD_RESET_EXPIRES_IN=1h
 CONFIRM_ACCOUNT_SECRET=dev_only
 CONFIRM_ACCOUNT_EXPIRES_IN=1h
 FRONTEND_DOCKER_IMAGE=linuxtry
+I18N_TRANSLATION_FILENAME=messages
+
+# Mongo configs
+APP_MONGO_EXPRESS_PORT=9000
+MONGO_USER=dev_only
+MONGO_PASSWORD=dev_only
+MONGO_URI=mongodb://dev_only:dev_only@mongo:27017/
+MONGO_DB=hexabot
+
+# SMTP Config for local dev env
+APP_SMTP_4_DEV_PORT=9002
 EMAIL_SMTP_HOST=smtp4dev
 EMAIL_SMTP_PORT=25
 EMAIL_SMTP_SECURE=false
 EMAIL_SMTP_USER=dev_only
 EMAIL_SMTP_PASS=dev_only
-I18N_TRANSLATION_FILENAME=messages
 
 # NLU Server
 AUTH_TOKEN=token123
@@ -42,11 +49,11 @@ NLP_PORT=5000
 
 # Frontend (Next.js)
 APP_FRONTEND_PORT=8080
-NEXT_PUBLIC_API_ORIGIN=http://localhost:4000/
+NEXT_PUBLIC_API_ORIGIN=http://${APP_DOMAIN}:4000/
 NEXT_PUBLIC_SSO_ENABLED=false
 
 # Widget
 APP_WIDGET_PORT=5173
-REACT_APP_WIDGET_API_URL=http://localhost:4000
+REACT_APP_WIDGET_API_URL=http://${APP_DOMAIN}:4000
 REACT_APP_WIDGET_CHANNEL=offline
 REACT_APP_WIDGET_TOKEN=token123

docker/docker-compose.nginx.dev.yml

@@ -4,5 +4,5 @@ services:
     nginx:
       container_name: nginx
       volumes:
-        - ./nginx/unsecure/:/etc/nginx:ro
+        - ./nginx/unsecure/:/etc/nginx/templates/
         - /etc/localtime:/etc/localtime:ro

docker/docker-compose.nginx.prod.yml

@@ -4,7 +4,7 @@ services:
   nginx:
     container_name: nginx
     volumes:
-      - ./nginx/secure/:/etc/nginx:ro
+      - ./nginx/secure/:/etc/nginx/templates/
       - /etc/localtime:/etc/localtime:ro
       - ./nginx/certbot/conf:/etc/letsencrypt
       - ./nginx/certbot/www:/var/www/certbot

docker/docker-compose.nginx.yml

@@ -5,14 +5,12 @@ services:
     container_name: nginx
     image: nginx:latest
     restart: unless-stopped
+    env_file: .env
     networks:
       - app-network
     ports:
       - 80:80
       - 443:443
-    volumes:
-      - ./nginx/unsecure/:/etc/nginx:ro
-      - /etc/localtime:/etc/localtime:ro
     depends_on:
       - api
       - hexabot-frontend

docker/init-letsencrypt.sh

@@ -10,11 +10,11 @@ if ! [ -x "$(command -v docker compose)" ]; then
     exit 1
 fi
 
-domains=(demo.hexabot.io)
+domains=(${APP_DOMAIN:-example.hexabot.ai})
 rsa_key_size=4096
 data_path="./nginx/certbot"
-email="[email protected]" # Adding a valid address is strongly recommended
-staging=0                                # Set to 1 if you're testing your setup to avoid hitting request limits
+email="${SSL_EMAIL:-hello@hexabot.ai}" # Adding a valid address is strongly recommended
+staging=0 # Set to 1 if you're testing your setup to avoid hitting request limits
 
 if [ -d "$data_path" ]; then
     read -p "Existing data found for $domains. Continue and replace existing certificate? (y/N) " decision

docker/nginx/secure/default.conf → docker/nginx/secure/default.conf.template

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name demo.hexabot.io;
+    server_name $APP_DOMAIN;
 
     location / {
         return 301 https://$host$request_uri;
@@ -13,12 +13,12 @@ server {
 
 server {
     listen 443 ssl;
-    server_name demo.hexabot.io;
+    server_name $APP_DOMAIN;
     server_tokens off;
     client_max_body_size 20M;
 
-    ssl_certificate /etc/letsencrypt/live/demo.hexabot.io/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/demo.hexabot.io/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/$APP_DOMAIN/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/$APP_DOMAIN/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 

docker/nginx/unsecure/default.conf → docker/nginx/unsecure/default.conf.template

@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name localhost;
+    server_name $APP_DOMAIN;
     server_tokens off;
     client_max_body_size 20M;