summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfumingwei <[email protected]>2024-06-11 18:48:02 +0800
committerfumingwei <[email protected]>2024-06-11 18:48:02 +0800
commit8b70f1f19c7e827e3cea722eee6a7622335bb36a (patch)
treeabba634edaeeddf327dfe8e6affce29998ef4df2
parent0e9a9fe83b56b8bffa3ad9ff96c45f4b11f643f0 (diff)
bugfix: Add shaping site in shaping domain.v2.0.6
-rw-r--r--images_build/client/dign_client/bin/client.py12
-rw-r--r--images_build/server_web/domains/misc/badssl.com/index.html8
-rw-r--r--images_build/server_web/domains/testing-rate-limit/no-rate-limit.conf4
-rw-r--r--images_build/server_web/domains/testing-rate-limit/rate-limit-0bps.conf4
-rw-r--r--images_build/server_web/domains/testing-rate-limit/rate-limit-1000gbps.conf4
5 files changed, 16 insertions, 16 deletions
diff --git a/images_build/client/dign_client/bin/client.py b/images_build/client/dign_client/bin/client.py
index 6fcfd4d..11c1cd8 100644
--- a/images_build/client/dign_client/bin/client.py
+++ b/images_build/client/dign_client/bin/client.py
@@ -1579,7 +1579,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_NoRateLimit_HTTP",
"protocol_type": "http",
"test_function": ShapingCaseRunner.no_rate_limit_protocol_http,
- "request_content": "http://testing-no-rate-limit.badssl.selftest.gdnt-cloud.website/resources/64M",
+ "request_content": "http://testing-shaping-no-rate-limit.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12,
"max_recv_speed": None
},
@@ -1587,7 +1587,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_NoRateLimit_HTTPS",
"protocol_type": "https",
"test_function": ShapingCaseRunner.no_rate_limit_protocol_https,
- "request_content": "https://testing-no-rate-limit.badssl.selftest.gdnt-cloud.website/resources/64M",
+ "request_content": "https://testing-shaping-no-rate-limit.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12,
"max_recv_speed": None
},
@@ -1595,7 +1595,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_RateLimit0bps_HTTP",
"protocol_type": "http",
"test_function": ShapingCaseRunner.rate_limit_0bps_protocol_http,
- "request_content": "http://testing-rate-limit-0bps.badssl.selftest.gdnt-cloud.website/resources/64M",
+ "request_content": "http://testing-shaping-rate-limit-0bps.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12,
"max_recv_speed": 6553600
},
@@ -1603,7 +1603,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_RateLimit0bps_HTTPS",
"protocol_type": "https",
"test_function": ShapingCaseRunner.rate_limit_0bps_protocol_https,
- "request_content": "https://testing-rate-limit-0bps.badssl.selftest.gdnt-cloud.website/resources/64M",
+ "request_content": "https://testing-shaping-rate-limit-0bps.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12,
"max_recv_speed": 6553600
},
@@ -1611,7 +1611,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_RateLimit1000gbps_HTTP",
"protocol_type": "http",
"test_function": ShapingCaseRunner.rate_limit_1000gbps_protocol_http,
- "request_content": "http://testing-rate-limit-1000gbps.badssl.selftest.gdnt-cloud.website/resources/64M",
+ "request_content": "http://testing-shaping-rate-limit-1000gbps.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12,
"max_recv_speed": 6553600
},
@@ -1619,7 +1619,7 @@ class DiagnoseCasesRunner:
"name": "Shaping_RateLimit1000gbps_HTTPS",
"protocol_type": "https",
"test_function": ShapingCaseRunner.rate_limit_1000gbps_protocol_https,
- "request_content": "https://testing-rate-limit-1000gbps.badssl.selftest.gdnt-cloud.website/resources/64M",
+ "request_content": "https://testing-shaping-rate-limit-1000gbps.badssl.selftest.gdnt-cloud.website/resources/64M",
"conn_timeout": 12,
"max_recv_speed": 6553600
}
diff --git a/images_build/server_web/domains/misc/badssl.com/index.html b/images_build/server_web/domains/misc/badssl.com/index.html
index e70701a..52ee444 100644
--- a/images_build/server_web/domains/misc/badssl.com/index.html
+++ b/images_build/server_web/domains/misc/badssl.com/index.html
@@ -203,10 +203,10 @@
</div>
<div class="group">
<h2 id="testing-rate-limit"><span class="emoji">🛞</span>Testing expand</h2>
- <a href="http://testing-rate-limit-0bps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing http connection rate limit 0 bps</a>
- <a href="https://testing-rate-limit-0bps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing https connection rate limit 0 bps</a>
- <a href="http://testing-rate-limit-1000gbps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing http connection rate limit 1000 Gbps</a>
- <a href="https://testing-rate-limit-1000gbps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing https connection rate limit 1000 Gbps</a>
+ <a href="http://testing-shaping-rate-limit-0bps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing http connection rate limit 0 bps</a>
+ <a href="https://testing-shaping-rate-limit-0bps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing https connection rate limit 0 bps</a>
+ <a href="http://testing-shaping-rate-limit-1000gbps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing http connection rate limit 1000 Gbps</a>
+ <a href="https://testing-shaping-rate-limit-1000gbps.{{ site.domain }}/" target="_blank" class="good"><span class="icon"></span>Testing https connection rate limit 1000 Gbps</a>
</div>
<div id="preload" style="width: 0; height: 0;">
<!-- <link rel=preload> results in warnings in Chrome: https://crbug.com/661055 -->
diff --git a/images_build/server_web/domains/testing-rate-limit/no-rate-limit.conf b/images_build/server_web/domains/testing-rate-limit/no-rate-limit.conf
index ceedade..a53849a 100644
--- a/images_build/server_web/domains/testing-rate-limit/no-rate-limit.conf
+++ b/images_build/server_web/domains/testing-rate-limit/no-rate-limit.conf
@@ -2,14 +2,14 @@
---
server {
listen 80;
- server_name testing-no-rate-limit.{{ site.domain }};
+ server_name testing-shaping-no-rate-limit.{{ site.domain }};
include {{ site.serving-path }}/common/common.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root;
}
server {
listen 443;
- server_name testing-no-rate-limit.{{ site.domain }};
+ server_name testing-shaping-no-rate-limit.{{ site.domain }};
include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf;
include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root;
diff --git a/images_build/server_web/domains/testing-rate-limit/rate-limit-0bps.conf b/images_build/server_web/domains/testing-rate-limit/rate-limit-0bps.conf
index 71df19f..ead4519 100644
--- a/images_build/server_web/domains/testing-rate-limit/rate-limit-0bps.conf
+++ b/images_build/server_web/domains/testing-rate-limit/rate-limit-0bps.conf
@@ -2,14 +2,14 @@
---
server {
listen 80;
- server_name testing-rate-limit-0bps.{{ site.domain }};
+ server_name testing-shaping-rate-limit-0bps.{{ site.domain }};
include {{ site.serving-path }}/common/common.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root;
}
server {
listen 443;
- server_name testing-rate-limit-0bps.{{ site.domain }};
+ server_name testing-shaping-rate-limit-0bps.{{ site.domain }};
include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf;
include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root;
diff --git a/images_build/server_web/domains/testing-rate-limit/rate-limit-1000gbps.conf b/images_build/server_web/domains/testing-rate-limit/rate-limit-1000gbps.conf
index 1ee5d09..0ffd3c2 100644
--- a/images_build/server_web/domains/testing-rate-limit/rate-limit-1000gbps.conf
+++ b/images_build/server_web/domains/testing-rate-limit/rate-limit-1000gbps.conf
@@ -2,7 +2,7 @@
---
server {
listen 80;
- server_name testing-rate-limit-1000gbps.{{ site.domain }};
+ server_name testing-shaping-rate-limit-1000gbps.{{ site.domain }};
include {{ site.serving-path }}/common/common.conf;
root {{ site.serving-path }}/domains/testing-rate-limit/root;
@@ -10,7 +10,7 @@ server {
server {
listen 443;
- server_name testing-rate-limit-1000gbps.{{ site.domain }};
+ server_name testing-shaping-rate-limit-1000gbps.{{ site.domain }};
include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf;
include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;