diff --git a/.env b/.env index 6fa7420..50e7434 100644 --- a/.env +++ b/.env @@ -24,7 +24,7 @@ MINIO_BUCKET=aviation MINIO_PROTOCOL=http MINIO_PORT=9000 MINIO_PORT_INTERNAL=9001 -MINIO_BROWSER_REDIRECT_URL=${NGINX_PROTOCOL}://${NGINX_HOST}:${NGINX_HTTPS_PORT}/minio/ +MINIO_BROWSER_REDIRECT_URL=${NGINX_PROTOCOL}://${NGINX_HOST}:${NGINX_HTTP_PORT}/minio/ UI_PORT=3000 API_PORT=5000 @@ -34,7 +34,8 @@ SSL_CA_PATH=../ssl/${SSL_CA_NAME}.pem SSL_CERT_PATH=../ssl/localhost.crt SSL_CERT_KEY_PATH=../ssl/localhost.key -VITE_API_URL=${NGINX_PROTOCOL}://${NGINX_HOST}:${NGINX_HTTPS_PORT}/api +VITE_API_URL=${NGINX_PROTOCOL}://${NGINX_HOST}:${NGINX_HTTP_PORT}/api +__VITE_ADDITIONAL_SERVER_ALLOWED_HOSTS:${NGINX_HOST} ENVIRONMENT=development ADMIN_EMAIL=admin@example.com diff --git a/Makefile b/Makefile index 7e2c35b..2ab9c52 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ #!make SHELL := /bin/bash +export API_VERSION = $(shell awk -F ' = ' '$$1 ~ /package.version/ { gsub(/[\"]/, "", $$2); printf("%s",$$2) }' api/Cargo.toml) +export UI_VERSION := $(shell awk -F'"' '/"version"/ { print $$4 }' ui/package.json) + include .env -include .env.local export diff --git a/bruno/environments/aviation.bensherriff.com.bru b/bruno/environments/aviation.bensherriff.com.bru new file mode 100644 index 0000000..77a9078 --- /dev/null +++ b/bruno/environments/aviation.bensherriff.com.bru @@ -0,0 +1,3 @@ +vars { + BASE_URL: https://aviation.bensherriff.com +}