From 99f428f3460a2fd1c21e32c80da8f33b7500c7ec Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Thu, 10 Oct 2024 17:13:23 +0530 Subject: [PATCH 1/2] modify ip to https domain name --- README.md | 4 ++-- scripts/live_andrew.sh | 2 +- scripts/live_madhava.sh | 2 +- syftbox/client/client.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 026828aa..9dcf8252 100644 --- a/README.md +++ b/README.md @@ -66,13 +66,13 @@ uv run syftbox/client/client.py ### Run Client ``` -syftbox client --config_path=./config.json --sync_folder=~/Desktop/SyftBox --email=your@email.org --port=8082 --server=http://20.168.10.234:8080 +syftbox client --config_path=./config.json --sync_folder=~/Desktop/SyftBox --email=your@email.org --port=8082 --server=https://syftbox.openmined.org ``` ### Deploy This builds the latest source to a wheel and deploys and restarts the server: -http://20.168.10.234:8080 +https://syftbox.openmined.org ``` ./scripts/deploy.sh diff --git a/scripts/live_andrew.sh b/scripts/live_andrew.sh index 6f0d297f..6370bb5b 100755 --- a/scripts/live_andrew.sh +++ b/scripts/live_andrew.sh @@ -1,2 +1,2 @@ #!/bin/bash -uv run syftbox/client/client.py --config_path=./users/live_andrew.json --sync_folder=./users/live_andrew --email=andrew@openmined.org --port=8082 --server=http://20.168.10.234:8080 +uv run syftbox/client/client.py --config_path=./users/live_andrew.json --sync_folder=./users/live_andrew --email=andrew@openmined.org --port=8082 --server=https://syftbox.openmined.org diff --git a/scripts/live_madhava.sh b/scripts/live_madhava.sh index bd655b8e..57b17d7a 100755 --- a/scripts/live_madhava.sh +++ b/scripts/live_madhava.sh @@ -1,2 +1,2 @@ #!/bin/bash -uv run syftbox/client/client.py --config_path=./users/live_madhava.json --sync_folder=./users/live_madhava --email=madhava@openmined.org --port=8081 --server=http://20.168.10.234:8080 +uv run syftbox/client/client.py --config_path=./users/live_madhava.json --sync_folder=./users/live_madhava --email=madhava@openmined.org --port=8081 --server=https://syftbox.openmined.org diff --git a/syftbox/client/client.py b/syftbox/client/client.py index 61201b70..fc912b18 100644 --- a/syftbox/client/client.py +++ b/syftbox/client/client.py @@ -280,7 +280,7 @@ def parse_args(): parser.add_argument( "--server", type=str, - default="http://20.168.10.234:8080", + default="https://syftbox.openmined.org", help="Server", ) return parser.parse_args() From 6b942a84cf91bbeb7a3e92a4832423ebd2c304d8 Mon Sep 17 00:00:00 2001 From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com> Date: Thu, 10 Oct 2024 19:01:12 +0530 Subject: [PATCH 2/2] add migration for https --- syftbox/client/client.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/syftbox/client/client.py b/syftbox/client/client.py index fc912b18..7dca4ec7 100644 --- a/syftbox/client/client.py +++ b/syftbox/client/client.py @@ -119,6 +119,10 @@ def load_or_create_config(args) -> ClientConfig: if email_token: client_config.email_token = email_token + # Migrate Old Server URL to HTTPS + if client_config.server_url == "http://20.168.10.234:8080": + client_config.server_url = "https://syftbox.openmined.org" + client_config.save(args.config_path) return client_config