summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2024-06-18 17:21:51 +0200
committerGitHub <noreply@github.com>2024-06-18 16:21:51 +0100
commit97c3d988161f69821f00b722aafaea4fcb31759f (patch)
treef30651a502235dc1f3af67a63961223f770cba10 /debian
parentMerge branch 'master' into develop (diff)
downloadsynapse-97c3d988161f69821f00b722aafaea4fcb31759f.tar.xz
register_new_matrix_user: add password-file flag (#17294)
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/register_new_matrix_user.ronn8
2 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e9b05f8553..55e17bd868 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.109.0+nmu1) UNRELEASED; urgency=medium
+
+  * `register_new_matrix_user` now supports a --password-file flag.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 18 Jun 2024 13:29:36 +0100
+
 matrix-synapse-py3 (1.109.0) stable; urgency=medium
 
   * New synapse release 1.109.0.
diff --git a/debian/register_new_matrix_user.ronn b/debian/register_new_matrix_user.ronn
index 0410b1f4cd..963e67c004 100644
--- a/debian/register_new_matrix_user.ronn
+++ b/debian/register_new_matrix_user.ronn
@@ -31,8 +31,12 @@ A sample YAML file accepted by `register_new_matrix_user` is described below:
     Local part of the new user. Will prompt if omitted.
 
   * `-p`, `--password`:
-    New password for user. Will prompt if omitted. Supplying the password
-    on the command line is not recommended. Use the STDIN instead.
+    New password for user. Will prompt if this option and `--password-file` are omitted.
+    Supplying the password on the command line is not recommended.
+
+  * `--password-file`:
+    File containing the new password for user. If set, overrides `--password`.
+    This is a more secure alternative to specifying the password on the command line.
 
   * `-a`, `--admin`:
     Register new user as an admin. Will prompt if omitted.