diff options
author | Patrick Cloke <patrickc@matrix.org> | 2023-11-09 09:48:24 -0500 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2023-11-09 09:48:24 -0500 |
commit | 396fa974a10a393be068ff2ab87134e89567b808 (patch) | |
tree | fa9cc3cd57a77b71b68dd5f22afe952220ed936a /synapse/_scripts | |
parent | Don't use separate copy_read method. (diff) | |
parent | Bump pyicu from 2.11 to 2.12 (#16603) (diff) | |
download | synapse-396fa974a10a393be068ff2ab87134e89567b808.tar.xz |
Merge remote-tracking branch 'origin/develop' into clokep/psycopg3
Diffstat (limited to 'synapse/_scripts')
-rw-r--r-- | synapse/_scripts/register_new_matrix_user.py | 4 | ||||
-rwxr-xr-x | synapse/_scripts/synapse_port_db.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/_scripts/register_new_matrix_user.py b/synapse/_scripts/register_new_matrix_user.py index 19ca399d44..9293808640 100644 --- a/synapse/_scripts/register_new_matrix_user.py +++ b/synapse/_scripts/register_new_matrix_user.py @@ -50,7 +50,7 @@ def request_registration( url = "%s/_synapse/admin/v1/register" % (server_location.rstrip("/"),) # Get the nonce - r = requests.get(url, verify=False) + r = requests.get(url) if r.status_code != 200: _print("ERROR! Received %d %s" % (r.status_code, r.reason)) @@ -88,7 +88,7 @@ def request_registration( } _print("Sending registration request...") - r = requests.post(url, json=data, verify=False) + r = requests.post(url, json=data) if r.status_code != 200: _print("ERROR! Received %d %s" % (r.status_code, r.reason)) diff --git a/synapse/_scripts/synapse_port_db.py b/synapse/_scripts/synapse_port_db.py index ab2b29cf1b..ef8590db65 100755 --- a/synapse/_scripts/synapse_port_db.py +++ b/synapse/_scripts/synapse_port_db.py @@ -191,7 +191,7 @@ IGNORED_TABLES = { "user_directory_search_stat", "user_directory_search_pos", "users_who_share_private_rooms", - "users_in_public_room", + "users_in_public_rooms", # UI auth sessions have foreign keys so additional care needs to be taken, # the sessions are transient anyway, so ignore them. "ui_auth_sessions", |