Skip to content

Commit 00a0b6a

Browse files
authored
Merge pull request #343 from Dstack-TEE/dstack-org
Replace kvin.wang with dstack.org
2 parents 887160b + 1029b7a commit 00a0b6a

File tree

9 files changed

+18
-35
lines changed

9 files changed

+18
-35
lines changed

README.md

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ Once your app is deployed and listening on an HTTP port, you can access it throu
212212

213213
**Examples**:
214214

215-
- `3327603e03f5bd1f830812ca4a789277fc31f577-8080.app.kvin.wang` → port `8080` (TLS termination to any TCP)
216-
- `3327603e03f5bd1f830812ca4a789277fc31f577-8080g.app.kvin.wang` → port `8080` (TLS termination with HTTP/2 negotiation)
217-
- `3327603e03f5bd1f830812ca4a789277fc31f577-8080s.app.kvin.wang` → port `8080` (TLS passthrough to any TCP)
215+
- `3327603e03f5bd1f830812ca4a789277fc31f577-8080.test0.dstack.org` → port `8080` (TLS termination to any TCP)
216+
- `3327603e03f5bd1f830812ca4a789277fc31f577-8080g.test0.dstack.org` → port `8080` (TLS termination with HTTP/2 negotiation)
217+
- `3327603e03f5bd1f830812ca4a789277fc31f577-8080s.test0.dstack.org` → port `8080` (TLS passthrough to any TCP)
218218

219219
The `<id>` can be either the app ID or instance ID. When using the app ID, the load balancer will select one of the available instances. Adding an `s` suffix enables TLS passthrough to the app instead of terminating at dstack-gateway. Adding a `g` suffix enables HTTPS/2 with TLS termination for gRPC applications.
220220

@@ -258,7 +258,7 @@ curl --unix-socket /var/run/dstack.sock http://localhost/GetQuote?report_data=0x
258258
Container logs can be obtained from the CVM's `dashboard` page or by curl:
259259

260260
```bash
261-
curl 'http://<appid>.app.kvin.wang:9090/logs/<container name>?since=0&until=0&follow=true&text=true&timestamps=true&bare=true'
261+
curl 'http://<appid>.<the domain you set for dstack-gateway>:9090/logs/<container name>?since=0&until=0&follow=true&text=true&timestamps=true&bare=true'
262262
```
263263

264264
Replace `<appid>` and `<container name>` with actual values. Available parameters:
@@ -334,24 +334,7 @@ Then run the certbot in the `build/` and you will see the following log:
334334
$ RUST_LOG=info,certbot=debug ./certbot renew -c certbot.toml
335335
2024-10-25T07:41:00.682990Z INFO certbot::bot: creating new ACME account
336336
2024-10-25T07:41:00.869246Z INFO certbot::bot: created new ACME account: https://acme-staging-v02.api.letsencrypt.org/acme/acct/168601853
337-
2024-10-25T07:41:00.869270Z INFO certbot::bot: setting CAA records
338-
2024-10-25T07:41:00.869276Z DEBUG certbot::acme_client: setting guard CAA records for app.kvin.wang
339-
2024-10-25T07:41:01.740767Z DEBUG certbot::acme_client: removing existing CAA record app.kvin.wang 0 issuewild "letsencrypt.org;validationmethods=dns-01;accounturi=https://acme-staging-v02.api.letsencrypt.org/acme/acct/168578683"
340-
2024-10-25T07:41:01.991298Z DEBUG certbot::acme_client: removing existing CAA record app.kvin.wang 0 issue "letsencrypt.org;validationmethods=dns-01;accounturi=https://acme-staging-v02.api.letsencrypt.org/acme/acct/168578683"
341-
2024-10-25T07:41:02.216751Z DEBUG certbot::acme_client: setting CAA records for app.kvin.wang, 0 issue "letsencrypt.org;validationmethods=dns-01;accounturi=https://acme-staging-v02.api.letsencrypt.org/acme/acct/168601853"
342-
2024-10-25T07:41:02.424217Z DEBUG certbot::acme_client: setting CAA records for app.kvin.wang, 0 issuewild "letsencrypt.org;validationmethods=dns-01;accounturi=https://acme-staging-v02.api.letsencrypt.org/acme/acct/168601853"
343-
2024-10-25T07:41:02.663824Z DEBUG certbot::acme_client: removing guard CAA records for app.kvin.wang
344-
2024-10-25T07:41:03.095564Z DEBUG certbot::acme_client: generating new cert key pair
345-
2024-10-25T07:41:03.095678Z DEBUG certbot::acme_client: requesting new certificates for *.app.kvin.wang
346-
2024-10-25T07:41:03.095699Z DEBUG certbot::acme_client: creating new order
347-
2024-10-25T07:41:03.250382Z DEBUG certbot::acme_client: order is pending, waiting for authorization
348-
2024-10-25T07:41:03.283600Z DEBUG certbot::acme_client: creating dns record for app.kvin.wang
349-
2024-10-25T07:41:04.027882Z DEBUG certbot::acme_client: challenge not found, waiting 500ms tries=2 domain="_acme-challenge.app.kvin.wang"
350-
2024-10-25T07:41:04.600711Z DEBUG certbot::acme_client: challenge not found, waiting 1s tries=3 domain="_acme-challenge.app.kvin.wang"
351-
2024-10-25T07:41:05.642300Z DEBUG certbot::acme_client: challenge not found, waiting 2s tries=4 domain="_acme-challenge.app.kvin.wang"
352-
2024-10-25T07:41:07.715947Z DEBUG certbot::acme_client: challenge not found, waiting 4s tries=5 domain="_acme-challenge.app.kvin.wang"
353-
2024-10-25T07:41:11.724831Z DEBUG certbot::acme_client: challenge not found, waiting 8s tries=6 domain="_acme-challenge.app.kvin.wang"
354-
2024-10-25T07:41:19.815990Z DEBUG certbot::acme_client: challenge not found, waiting 16s tries=7 domain="_acme-challenge.app.kvin.wang"
337+
...
355338
2024-10-25T07:41:35.852790Z DEBUG certbot::acme_client: setting challenge ready for https://acme-staging-v02.api.letsencrypt.org/acme/chall-v3/14584884443/mQ-I2A
356339
2024-10-25T07:41:35.934425Z DEBUG certbot::acme_client: challenges are ready, waiting for order to be ready
357340
2024-10-25T07:41:37.972434Z DEBUG certbot::acme_client: order is ready, uploading csr
@@ -391,16 +374,16 @@ Execute dstack-gateway with `sudo ./dstack-gateway -c gateway.toml`, then access
391374

392375
To enhance security, we've limited TLS certificate issuance to dstack-gateway via CAA records. However, since these records can be modified through Cloudflare's domain management, we need to implement global CA certificate monitoring to maintain security oversight.
393376

394-
`ct_monitor` tracks Certificate Transparency logs via [https://crt.sh](https://crt.sh/?q=app.kvin.wang), comparing their public key with the ones got from dstack-gateway RPC. It immediately alerts when detecting unauthorized certificates not issued through dstack-gateway:
377+
`ct_monitor` tracks Certificate Transparency logs via https://crt.sh, comparing their public key with the ones got from dstack-gateway RPC. It immediately alerts when detecting unauthorized certificates not issued through dstack-gateway:
395378

396379
```text
397-
$ ./ct_monitor -t https://localhost:9010/prpc -d app.kvin.wang
398-
2024-10-25T08:12:11.366463Z INFO ct_monitor: monitoring app.kvin.wang...
380+
$ ./ct_monitor -t https://localhost:9010/prpc -d <YOUR_DOMAIN>
381+
2024-10-25T08:12:11.366463Z INFO ct_monitor: monitoring <YOUR_DOMAIN>...
399382
2024-10-25T08:12:11.366488Z INFO ct_monitor: fetching known public keys from https://localhost:9010/prpc
400383
2024-10-25T08:12:11.566222Z INFO ct_monitor: got 2 known public keys
401384
2024-10-25T08:12:13.142122Z INFO ct_monitor: ✅ checked log id=14705660685
402385
2024-10-25T08:12:13.802573Z INFO ct_monitor: ✅ checked log id=14705656674
403-
2024-10-25T08:12:14.494944Z ERROR ct_monitor: ❌ error in CTLog { id: 14666084839, issuer_ca_id: 295815, issuer_name: "C=US, O=Let's Encrypt, CN=R11", common_name: "kvin.wang", name_value: "*.app.kvin.wang", not_before: "2024-09-24T02:23:15", not_after: "2024-12-23T02:23:14", serial_number: "03ae796f56a933c8ff7e32c7c0d662a253d4", result_count: 1, entry_timestamp: "2024-09-24T03:21:45.825" }
386+
2024-10-25T08:12:14.494944Z ERROR ct_monitor: ❌ error in CTLog { id: 14666084839, issuer_ca_id: 295815, issuer_name: "C=US, O=Let's Encrypt, CN=R11", common_name: "<YOUR_DOMAIN>", name_value: "*.<YOUR_DOMAIN>", not_before: "2024-09-24T02:23:15", not_after: "2024-12-23T02:23:14", serial_number: "03ae796f56a933c8ff7e32c7c0d662a253d4", result_count: 1, entry_timestamp: "2024-09-24T03:21:45.825" }
404387
2024-10-25T08:12:14.494998Z ERROR ct_monitor: error: certificate has issued to unknown pubkey: 30820122300d06092a864886f70d01010105000382010f003082010a02820101009de65c767caf117880626d1acc1ee78f3c6a992e3fe458f34066f92812ac550190a67e49ebf4f537003c393c000a8ec3e114da088c0cb02ffd0881fd39a2b32cc60d2e9989f0efab3345bee418262e0179d307d8d361fd0837f85d17eab92ec6f4126247e614aa01f4efcc05bc6303a8be68230f04326c9e85406fc4d234e9ce92089253b11d002cdf325582df45d5da42981cd546cbd2e9e49f0fa6636e747a345aaf8cefa02556aa258e1f7f90906be8fe51567ac9626f35bc46837e4f3203387fee59c71cea400000007c24e7537debc1941b36ff1612990233e4c219632e35858b1771f17a71944adf6c657dd7303583e3aeed199bd36a3152f49980f4f30203010001
405388
```
406389

docs/deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ GUEST_AGENT_ADDR=127.0.0.1:9205
104104
ETH_RPC_URL=https://rpc.phala.network
105105
GIT_REV=HEAD
106106
OS_IMAGE=dstack-0.5.2
107-
IMAGE_DOWNLOAD_URL=https://files.kvin.wang/images/mr_{OS_IMAGE_HASH}.tar.gz
107+
IMAGE_DOWNLOAD_URL=https://download.dstack.org/os-images/mr_{OS_IMAGE_HASH}.tar.gz
108108
```
109109

110110
Then run the script again.

gateway/dstack-app/builder/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
environment:
4545
- IMAGE_DOWNLOAD_URL=${IMAGE_DOWNLOAD_URL:-http://localhost:8001/mr_{OS_IMAGE_HASH}.tar.gz}
4646
- AUTH_TYPE=dev
47-
- DEV_DOMAIN=kms.1022.kvin.wang
47+
- DEV_DOMAIN=kms.1022.dstack.org
4848
- QUOTE_ENABLED=false
4949
```
5050

gateway/src/proxy/tls_passthough.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ mod tests {
150150
async fn test_resolve_app_address() {
151151
let app_addr = resolve_app_address(
152152
"_dstack-app-address",
153-
"3327603e03f5bd1f830812ca4a789277fc31f577.app.kvin.wang",
153+
"3327603e03f5bd1f830812ca4a789277fc31f577.app.dstack.org",
154154
false,
155155
)
156156
.await

kms/dstack-app/builder/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
environment:
4545
- IMAGE_DOWNLOAD_URL=${IMAGE_DOWNLOAD_URL:-http://localhost:8001/mr_{OS_IMAGE_HASH}.tar.gz}
4646
- AUTH_TYPE=dev
47-
- DEV_DOMAIN=kms.1022.kvin.wang
47+
- DEV_DOMAIN=kms.1022.dstack.org
4848
- QUOTE_ENABLED=false
4949
```
5050

kms/dstack-app/deploy-to-vmm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ else
3535
# GUEST_AGENT_ADDR=127.0.0.1:9205
3636
3737
# The URL of the dstack app image download URL
38-
# IMAGE_DOWNLOAD_URL=https://files.kvin.wang/images/mr_{OS_IMAGE_HASH}.tar.gz
38+
# IMAGE_DOWNLOAD_URL=https://download.dstack.org/os-images/mr_{OS_IMAGE_HASH}.tar.gz
3939
4040
# Image hash verification feature flag
4141
VERIFY_IMAGE=true

sdk/simulator/sys-config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"kms_urls": [
3-
"https://kms.1022.kvin.wang:12001"
3+
"https://kms.1022.dstack.org:12001"
44
],
55
"gateway_urls": [
6-
"https://tproxy.1022.kvin.wang:12002"
6+
"https://tproxy.1022.dstack.org:12002"
77
],
88
"pccs_url": "",
99
"docker_registry": "",

verifier/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Grab a quote from your app. It's depends on your app how to grab a quote.
116116

117117
```bash
118118
# Grab a quote from the demo app
119-
curl https://712eab2f507b963e11144ae67218177e93ac2a24-3000.app.kvin.wang:12004/GetQuote?report_data=0x1234 -o quote.json
119+
curl https://712eab2f507b963e11144ae67218177e93ac2a24-3000.test0.dstack.org:12004/GetQuote?report_data=0x1234 -o quote.json
120120
121121
```
122122

verifier/dstack-verifier.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ port = 8080
1010
image_cache_dir = "/tmp/dstack-verifier/cache"
1111

1212
# Image download URL template (replace {OS_IMAGE_HASH} with actual hash)
13-
image_download_url = "https://dstack-images.phala.network/mr_{OS_IMAGE_HASH}.tar.gz"
13+
image_download_url = "https://download.dstack.org/os-images/mr_{OS_IMAGE_HASH}.tar.gz"
1414

1515
# Image download timeout in seconds
1616
image_download_timeout_secs = 300

0 commit comments

Comments
 (0)