From f071ad1d5ab847052d54d90da6b88bd2971c6c25 Mon Sep 17 00:00:00 2001
From: James <james@ec0.io>
Date: Sat, 2 Nov 2019 17:16:22 +1100
Subject: [PATCH 1/2] Added hash_password to snap commands to allow
 snap-external usage

Signed-off-by: James Hebden <james@ec0.io>
---
 changelog.d/6315.feature |  1 +
 snap/snapcraft.yaml      | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/6315.feature

diff --git a/changelog.d/6315.feature b/changelog.d/6315.feature
new file mode 100644
index 000000000000..554676622852
--- /dev/null
+++ b/changelog.d/6315.feature
@@ -0,0 +1 @@
+Exposed synctl, hash_password and generate_config via the snap run interface.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9e644e8567d2..6b62b79114d7 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,20 +1,31 @@
 name: matrix-synapse
 base: core18
-version: git 
+version: git
 summary: Reference Matrix homeserver
 description: |
   Synapse is the reference Matrix homeserver.
   Matrix is a federated and decentralised instant messaging and VoIP system.
 
-grade: stable 
-confinement: strict 
+grade: stable
+confinement: strict
 
 apps:
-  matrix-synapse: 
+  matrix-synapse:
     command: synctl --no-daemonize start $SNAP_COMMON/homeserver.yaml
     stop-command: synctl -c $SNAP_COMMON stop
     plugs: [network-bind, network]
-    daemon: simple 
+    daemon: simple
+  hash-password:
+    command: hash_password
+  generate-config:
+    command: generate_config
+  generate-signing-key:
+    command: generate_signing_key.py
+  register-new-matrix-user:
+    command: register_new_matrix_user
+    plugs: [network]
+  synctl:
+    command: synctl
 parts:
   matrix-synapse:
     source: .

From c2546c230f265c9621841f94de08e945dfa4dda9 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 27 Feb 2020 12:43:44 +0000
Subject: [PATCH 2/2] Update 6315.feature

---
 changelog.d/6315.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/6315.feature b/changelog.d/6315.feature
index 554676622852..c5377dd1e966 100644
--- a/changelog.d/6315.feature
+++ b/changelog.d/6315.feature
@@ -1 +1 @@
-Exposed synctl, hash_password and generate_config via the snap run interface.
+Expose the `synctl`, `hash_password` and `generate_config` commands in the snapcraft package. Contributed by @devec0.