Update to latest patches

zsmartex · Sep 3, 2023 · cd13b99 · cd13b99
1 parent 6285300
commit cd13b99
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 24 deletions.
diff --git a/config/app.yml b/config/app.yml
@@ -1,8 +1,8 @@
 ---
 app:
   name: Z-Dax
-  domain: zsmartex.com
-  subdomain: demo
+  domain: zsmartex.io
+  subdomain: www
 render_protect: false
 ssl:
   enabled: true
@@ -12,21 +12,22 @@ images:
   rango: zsmartex/rango
   kouda: zsmartex/kouda
   quantex: zsmartex/quantex
-  coverapp: zsmartex/coverapp:dev
+  coverapp: zsmartex/coverapp
   castle: zsmartex/castle:dev
   mobiapp: zsmartex/mobiapp:dev
+  mailer: zsmartex/mailer
 twilio:
   phone_number: "+14159153078"
   account_sid: AC7901e689bbbf1ad92409186ac9ef6f71
   auth_token: 4c352b45d1e5dc5af8335e97f16fff7e
   service_id: MG093ddefd24da33eb3f93ba1834981a61
 vault:
-  root_token: s.BEhOs13brODPCBOlVuvqhYfN
-  peatio_token: s.2v4yQS8BTV64UxWNEYB8wnHh
-  peatio_crypto_token: s.Agi4aQpo7QRqYlYpqsYWvzOD
-  barong_token: s.A9HUNRu4BMZyBGZxpX8BjCt3
-  quantex_token: s.oEjuqE5MwTiD750IbVyLssKN
-  quantex_runner_token: s.fHD3avYFOfELlEgqCUgIdEnD
+  root_token: s.rw3Uy3Q7Nwgsj5GEdus9k70w
+  peatio_token: s.spuLSaTvbmRiohcaxCKLgAOx
+  peatio_crypto_token: s.bQxuqcEWRRKVfPRJd233N1Bi
+  barong_token: s.6zHYkkfwVtWkcorcSSJkUIwW
+  quantex_token: s.tSgOkyVGSgeNanKEZZeqLu34
+  quantex_runner_token: s.dLLKQIRAIKKh7vca4ddvBzxm
 database:
   host: db
   port: 5432
@@ -36,11 +37,11 @@ recaptcha:
   siteKey: changeme
   secretKey: changeme
 smtp:
-  host: smtpout.secureserver.net
-  port: 587
-  user: business@system.zsmartex.com
-  password: gdx_?3XM.B5?QSD
-  sender_email: business@system.zsmartex.com
+  host: mail.spacemail.com
+  port: 465
+  user: business@zsmartex.io
+  password: 79c7952F-50E5-412c-a63f-350dA2F40FA3
+  sender_email: business@zsmartex.io
   sender_name: ZSmartex
   sender_logo: https://i.imgur.com/hPhSOgu.png
 daemons:

diff --git a/templates/compose/daemons.yml.erb b/templates/compose/daemons.yml.erb
@@ -126,7 +126,7 @@ services:
 
   mailer:
     restart: always
-    image: mailer
+    image: "<%= @config['images']['mailer'] %>"
     env_file:
       - ../config/mailer.env
     volumes:

diff --git a/templates/compose/streams.yml.erb b/templates/compose/streams.yml.erb
@@ -83,14 +83,14 @@ services:
     entrypoint: /bin/sh
     command: -c "echo \"$$CONSOLE_CONFIG_FILE\" > /tmp/config.yml; /app/console"
     labels:
-      - "traefik.http.routers.sync-<%= @name %>.rule=Host(`sync.<%= @config['app']['domain'] %>`) && PathPrefix(`/`)"
-      - "traefik.http.services.sync-<%= @name %>.loadbalancer.server.port=8080"
+      - "traefik.http.routers.console-<%= @name %>.rule=Host(`console.<%= @config['app']['domain'] %>`) && PathPrefix(`/`)"
+      - "traefik.http.services.console-<%= @name %>.loadbalancer.server.port=8080"
       - "traefik.enable=true"
       <%- if @config['ssl']['enabled'] -%>
-      - "traefik.http.routers.sync-<%= @name %>.entrypoints=websecure"
-      - "traefik.http.routers.sync-<%= @name %>.tls=true"
+      - "traefik.http.routers.console-<%= @name %>.entrypoints=websecure"
+      - "traefik.http.routers.console-<%= @name %>.tls=true"
       <%- else -%>
-      - "traefik.http.routers.sync-<%= @name %>.entrypoints=web"
+      - "traefik.http.routers.console-<%= @name %>.entrypoints=web"
       <%- end -%>
 
 volumes:

diff --git a/templates/config/coverapp.env.erb b/templates/config/coverapp.env.erb
@@ -1,2 +1,4 @@
 REDIS_HOST=redis
 REDIS_PORT=6379
+
+NUXT_PUBLIC_API_URL=<%= ssl_helper('http') %>://<%= @config['app']['subdomain'] %>.<%= @config['app']['domain'] %>/api/v2/
diff --git a/templates/config/gateway/envoy.yaml.erb b/templates/config/gateway/envoy.yaml.erb
@@ -34,7 +34,7 @@ static_resources:
                   prefix: "/api/v2/auth"
                 route:
                   cluster: barong
-                  prefix_rewrite: "/api/v2"
+                  prefix_rewrite: "/api"
               - match:
                   prefix: "/api/v2/trade"
                 route:
@@ -44,7 +44,7 @@ static_resources:
                   prefix: "/api/v2/kouda"
                 route:
                   cluster: kouda
-                  prefix_rewrite: "/api/v2"
+                  prefix_rewrite: "/api"
               - match:
                   prefix: "/api/v2/quantex"
                 route:
@@ -104,7 +104,7 @@ static_resources:
                     - exact: x-frame-options
                     - exact: x-request-id
                     - exact: x-cache
-                path_prefix: "/api/v2/auth"
+                path_prefix: "/api/auth"
                 server_uri:
                   cluster: barong
                   timeout: 1.000s

diff --git a/templates/config/kouda.env.erb b/templates/config/kouda.env.erb
@@ -6,7 +6,8 @@ DATABASE_PORT=<%= @config['database']['port'] %>
 DATABASE_USER=<%= @config['database']['user'] %>
 DATABASE_PASS=<%= @config['database']['password'] %>
 
-REDIS_URL=redis://redis:6379
+REDIS_HOST=redis
+REDIS_PORT=6379
 
 EVENT_API_JWT_PRIVATE_KEY=<%= @jwt_private_key %>
 JWT_PUBLIC_KEY=<%= @jwt_public_key %>