Lots of updates.

3 files changed, 6 insertions, 3 deletions

diff --git a/dendrite/server/defaults/main.yaml b/dendrite/server/defaults/main.yaml
index 1c39fd7..898d563 100644
--- a/dendrite/server/defaults/main.yaml
+++ b/dendrite/server/defaults/main.yaml
@@ -4,9 +4,11 @@ dendrite_user: "dendrite"
 dendrite_version: "0.4.0"
 dendrite_tar: "https://github.com/matrix-org/dendrite/archive/refs/tags/v{{dendrite_version}}.tar.gz"
 dendrite_build_dir: "/tmp/dendrite-{{dendrite_version}}"
+dendrite_old_key: false
+dendrite_registration_secret: ""
 
 dendrite_db_user: "dendrite_{{dendrite_instance}}"
 dendrite_db: "{{dendrite_db_user}}"
 
 dendrite_dir: "/var/dendrite"
-dendrite_port: "8008"
+dendrite_port: 8008
diff --git a/dendrite/server/tasks/main.yaml b/dendrite/server/tasks/main.yaml
index efa3ab8..22e291e 100644
--- a/dendrite/server/tasks/main.yaml
+++ b/dendrite/server/tasks/main.yaml
@@ -2,7 +2,7 @@
 
 - name: add dendrite user
   become: yes
-  user: name="{{dendrite_user}}"
+  user: name="{{dendrite_user}}" shell="/bin/false" system="yes"
 
 # build
 - name: snap install golang
diff --git a/dendrite/server/templates/dendrite.yaml.j2 b/dendrite/server/templates/dendrite.yaml.j2
index bd03718..d32c91b 100644
--- a/dendrite/server/templates/dendrite.yaml.j2
+++ b/dendrite/server/templates/dendrite.yaml.j2
@@ -44,9 +44,10 @@ global:
   # to old signing private keys that were formerly in use on this domain. These
   # keys will not be used for federation request or event signing, but will be
   # provided to any other homeserver that asks when trying to verify old events.
-  old_private_keys:
+  {% if dendrite_old_key %}old_private_keys:
   - private_key: old_matrix_key.pem
     expired_at: 1626538450
+{% endif %}
 
   # How long a remote server can cache our server signing key before requesting it
   # again. Increasing this number will reduce the number of requests made by other