Merge pull request #264 from hollaex/testnet

HollaEx CLI v2.5.3 Release
hollaex · Dec 20, 2022 · f5ec528 · f5ec528
2 parents 78ab7a4 + a445922
commit f5ec528
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/hollaex b/hollaex
@@ -1916,12 +1916,8 @@ elif [[ "$1" == "setup" ]]; then
             fi 
 
             # Drop temp settings file for setup
-            if [[ -f $TEMP_CONFIG_FILE ]]; then 
-
-                rm $TEMP_CONFIG_FILE
+            rm -rf $HOLLAEX_CLI_INIT_PATH/settings/temp
 
-            fi
-
         else 
 
             echo "Error: Failed to start the HollaEx server."
@@ -7928,7 +7924,7 @@ elif [[ "$1" == "toolbox" ]]; then
 
         get_hmac_token;
 
-        echo "To apply the new HMAC Token on your exchange, please run 'hollaex toolbox --set_activation_code (--kube)."
+        echo "To apply the new HMAC Token on your exchange, please run 'hollaex server --restart' and 'hollaex toolbox --set_activation_code (--kube)'."
         echo "Please make sure that it's all good to rollback the security settings to the default, before proceeding."
 
     elif [[ "$ENABLE_MAINTENANCE_MODE" ]]; then

diff --git a/tools_generator.sh b/tools_generator.sh
@@ -1520,9 +1520,9 @@ metadata:
           return 503;
         }
     nginx.ingress.kubernetes.io/configuration-snippet: |
-      limit_req zone=api burst=10 nodelay;
+      $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_OPTIMIZED_RATE_LIMIT" ]]; then echo 'limit_req zone=api burst=10 nodelay;
       limit_req_log_level notice;
-      limit_req_status 429;
+      limit_req_status 429;'; fi)
 
       #error_page 403 @maintenance_503;
 
@@ -1592,9 +1592,9 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-body-size: "6m"
     nginx.ingress.kubernetes.io/configuration-snippet: |
       #error_page 403 @maintenance_503;
-      limit_req zone=sms burst=10 nodelay;
+      $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_OPTIMIZED_RATE_LIMIT" ]]; then echo 'limit_req zone=sms burst=10 nodelay;
       limit_req_log_level notice;
-      limit_req_status 429;
+      limit_req_status 429;'; fi)
 
 spec:
   rules:
@@ -1723,9 +1723,9 @@ metadata:
           return 503;
         }
     nginx.ingress.kubernetes.io/configuration-snippet: |
-      limit_req zone=api burst=10 nodelay;
+      $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_OPTIMIZED_RATE_LIMIT" ]]; then echo 'limit_req zone=api burst=10 nodelay;
       limit_req_log_level notice;
-      limit_req_status 429;
+      limit_req_status 429;'; fi)
 
       #error_page 403 @maintenance_503;
 
@@ -1797,9 +1797,9 @@ metadata:
     nginx.ingress.kubernetes.io/rewrite-target: /plugins/sms/verify/\$2
     nginx.ingress.kubernetes.io/configuration-snippet: |
       #error_page 403 @maintenance_503;
-      limit_req zone=sms burst=10 nodelay;
+      $(if [[ "$ENVIRONMENT_KUBERNETES_INGRESS_OPTIMIZED_RATE_LIMIT" ]]; then echo 'limit_req zone=sms burst=10 nodelay;
       limit_req_log_level notice;
-      limit_req_status 429;
+      limit_req_status 429;'; fi)
 
 spec:
   rules:

diff --git a/version b/version
@@ -1 +1 @@
-2.5.2
+2.5.3