Skip to content

Commit 527cad0

Browse files
author
erangi-ar
committed
fix: Update domain references from global-classifier-dev.rootcode.software to dev-gloclf.buerokratt.ee in configuration files
1 parent ea50354 commit 527cad0

6 files changed

Lines changed: 16 additions & 35 deletions

File tree

‎.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MINIO_BROWSER_REDIRECT_URL=http://localhost:9001/minio-console
1313
GF_SECURITY_ADMIN_USER=admin
1414
GF_SECURITY_ADMIN_PASSWORD=admin123
1515
GF_USERS_ALLOW_SIGN_UP=false
16-
GF_SERVER_ROOT_URL=https://global-classifier-dev.rootcode.software/grafana
16+
GF_SERVER_ROOT_URL=https://dev-gloclf.buerokratt.ee/grafana
1717
GF_SERVER_SERVE_FROM_SUB_PATH=true
1818
PORT=3000
1919
AWS_BEDROCK_ACCESS_KEY_ID=your_aws_access_key_id

‎GUI/nginx-config/global-classifier-dev‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Global Classifier Development Environment
22
# /etc/nginx/sites-available/global-classifier-dev
3-
# Domain: global-classifier-dev.rootcode.software
3+
# Domain: dev-gloclf.buerokratt.ee
44
# Public IP: 193.40.152.204
55
#
66
# To enable this site:
@@ -51,7 +51,7 @@ limit_req_zone $binary_remote_addr zone=general:10m rate=50r/s;
5151
# Main server block
5252
server {
5353
listen 80;
54-
server_name global-classifier-dev.rootcode.software 193.40.152.204;
54+
server_name dev-gloclf.buerokratt.ee 193.40.152.204;
5555

5656
# Basic security headers
5757
add_header X-Frame-Options SAMEORIGIN always;
@@ -539,22 +539,3 @@ server {
539539
add_header Content-Type text/plain;
540540
}
541541
}
542-
543-
# HTTPS server block (ready for SSL certificate)
544-
# server {
545-
# listen 443 ssl http2;
546-
# server_name global-classifier-dev.rootcode.software;
547-
548-
# ssl_certificate /etc/ssl/certs/global-classifier-dev.rootcode.software.pem;
549-
# ssl_certificate_key /etc/ssl/private/global-classifier-dev.rootcode.software.key;
550-
551-
# ssl_protocols TLSv1.2 TLSv1.3;
552-
# ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384;
553-
# ssl_prefer_server_ciphers off;
554-
# ssl_session_cache shared:SSL:10m;
555-
# ssl_session_timeout 1d;
556-
# ssl_session_tickets off;
557-
# add_header Strict-Transport-Security "max-age=63072000" always;
558-
559-
# # Mirror locations from the HTTP server block
560-
# }

‎GUI/vite.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default defineConfig({
3333
'Content-Security-Policy': process.env.REACT_APP_CSP,
3434
}),
3535
},
36-
allowedHosts: ['global-classifier-dev.rootcode.software', 'est-global-classifier-rtc.rootcode.software', 'localhost', '127.0.0.1'],
36+
allowedHosts: ['dev-gloclf.buerokratt.ee', 'est-global-classifier-rtc.rootcode.software', 'localhost', '127.0.0.1'],
3737
},
3838
resolve: {
3939
alias: {

‎constants.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GLOBAL_CLASSIFIER_TESTING_ENV_MODEL_SERVER=http://triton-test-server:8000
1313
GLOBAL_CLASSIFIER_TESTING_ENV_MODEL_METRICS=http://triton-test-server:8001
1414
GLOBAL_CLASSIFIER_PRODUCTION_ENV_MODEL_SERVER=http://triton-production-server:8000
1515
GLOBAL_CLASSIFIER_PRODUCTION_ENV_MODEL_METRICS=http://triton-production-server:8001
16-
DOMAIN=global-classifier-dev.rootcode.software
16+
DOMAIN=dev-gloclf.buerokratt.ee
1717
DB_PASSWORD=dbadmin
1818
CHATBOT_CLASSIFIER_SERVICE=http://classifier-service:8090
1919
GLOBAL_CLASSIFIER_S3_FERRY=http://gc-s3-ferry:3000

‎docker-compose-prod.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
container_name: ruuter-public
44
image: ruuter
55
environment:
6-
- application.cors.allowedOrigins=http://localhost:8086,http://localhost:3001,http://localhost:3003,http://localhost:3004,http://localhost:8080,http://localhost:8000,http://localhost:8090,https://global-classifier-dev.rootcode.software
6+
- application.cors.allowedOrigins=http://localhost:8086,http://localhost:3001,http://localhost:3003,http://localhost:3004,http://localhost:8080,http://localhost:8000,http://localhost:8090,https://dev-gloclf.buerokratt.ee
77
- application.httpCodesAllowList=200,201,202,204,400,401,403,500
88
- application.internalRequests.allowedIPs=127.0.0.1
99
- application.logging.displayRequestContent=true
@@ -25,7 +25,7 @@ services:
2525
container_name: ruuter-private
2626
image: ruuter
2727
environment:
28-
- application.cors.allowedOrigins=http://localhost:3001,http://localhost:3003,http://localhost:8088,http://localhost:3002,http://localhost:3004,http://localhost:8000,https://global-classifier-dev.rootcode.software
28+
- application.cors.allowedOrigins=http://localhost:3001,http://localhost:3003,http://localhost:8088,http://localhost:3002,http://localhost:3004,http://localhost:8000,https://dev-gloclf.buerokratt.ee
2929
- application.httpCodesAllowList=200,201,202,400,401,403,500
3030
- application.internalRequests.allowedIPs=127.0.0.1
3131
- application.logging.displayRequestContent=true
@@ -65,7 +65,7 @@ services:
6565
tim-postgresql:
6666
condition: service_started
6767
environment:
68-
- SECURITY_ALLOWLIST_JWT=ruuter-private,ruuter-public,data-mapper,resql,tim,tim-postgresql,chat-widget,authentication-layer,127.0.0.1,::1,global-classifier-dev.rootcode.software
68+
- SECURITY_ALLOWLIST_JWT=ruuter-private,ruuter-public,data-mapper,resql,tim,tim-postgresql,chat-widget,authentication-layer,127.0.0.1,::1,dev-gloclf.buerokratt.ee
6969
- KEY_PASS=ppjjpp
7070
ports:
7171
- 8085:8085
@@ -294,7 +294,7 @@ services:
294294
OPENSEARCH_PASSWORD: admin
295295
PORT: 4040
296296
REFRESH_INTERVAL: 1000
297-
CORS_WHITELIST_ORIGINS: http://localhost:3001,http://localhost:3002,http://localhost:3003,http://localhost:3004,http://localhost:8080,http://localhost:8088,https://global-classifier-dev.rootcode.software
297+
CORS_WHITELIST_ORIGINS: http://localhost:3001,http://localhost:3002,http://localhost:3003,http://localhost:3004,http://localhost:8080,http://localhost:8088,https://dev-gloclf.buerokratt.ee
298298
RUUTER_URL: http://ruuter-public:8086
299299
volumes:
300300
- /app/node_modules
@@ -317,18 +317,18 @@ services:
317317
container_name: gui
318318
environment:
319319
- NODE_ENV=local
320-
- REACT_APP_RUUTER_API_URL=https://global-classifier-dev.rootcode.software/ruuter-public
321-
- REACT_APP_RUUTER_PRIVATE_API_URL=https://global-classifier-dev.rootcode.software/ruuter-private
322-
- REACT_APP_CUSTOMER_SERVICE_LOGIN=https://global-classifier-dev.rootcode.software/authentication-layer/et/dev-auth
323-
- REACT_APP_NOTIFICATION_NODE_URL=https://global-classifier-dev.rootcode.software/notifications_node
324-
- REACT_APP_CSP=upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' https://global-classifier-dev.rootcode.software/ruuter-public https://global-classifier-dev.rootcode.software/ruuter-private https://global-classifier-dev.rootcode.software/authentication-layer/et/dev-auth https://global-classifier-dev.rootcode.software/notifications_node;
320+
- REACT_APP_RUUTER_API_URL=https://dev-gloclf.buerokratt.ee/ruuter-public
321+
- REACT_APP_RUUTER_PRIVATE_API_URL=https://dev-gloclf.buerokratt.ee/ruuter-private
322+
- REACT_APP_CUSTOMER_SERVICE_LOGIN=https://dev-gloclf.buerokratt.ee/authentication-layer/et/dev-auth
323+
- REACT_APP_NOTIFICATION_NODE_URL=https://dev-gloclf.buerokratt.ee/notifications_node
324+
- REACT_APP_CSP=upgrade-insecure-requests; default-src 'self'; font-src 'self' data:; img-src 'self' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; object-src 'none'; connect-src 'self' https://dev-gloclf.buerokratt.ee/ruuter-public https://dev-gloclf.buerokratt.ee/ruuter-private https://dev-gloclf.buerokratt.ee/authentication-layer/et/dev-auth https://dev-gloclf.buerokratt.ee/notifications_node;
325325
- DEBUG_ENABLED=true
326326
- CHOKIDAR_USEPOLLING=true
327327
- PORT=3001
328328
- REACT_APP_SERVICE_ID=conversations,settings,monitoring
329329
- REACT_APP_ENABLE_HIDDEN_FEATURES=TRUE
330330
- VITE_HOST=0.0.0.0
331-
- VITE_ALLOWED_HOSTS=global-classifier-dev.rootcode.software,localhost,127.0.0.1
331+
- VITE_ALLOWED_HOSTS=dev-gloclf.buerokratt.ee,localhost,127.0.0.1
332332

333333
build:
334334
context: ./GUI

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ services:
329329
- REACT_APP_SERVICE_ID=conversations,settings,monitoring
330330
- REACT_APP_ENABLE_HIDDEN_FEATURES=TRUE
331331
- VITE_HOST=0.0.0.0
332-
- VITE_ALLOWED_HOSTS=global-classifier-dev.rootcode.software,localhost,127.0.0.1
332+
- VITE_ALLOWED_HOSTS=dev-gloclf.buerokratt.ee,localhost,127.0.0.1
333333

334334
build:
335335
context: ./GUI

0 commit comments

Comments
 (0)