From e22fb8dc6265b9d802b64b6b72f30ce6d1855109 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige.mcwhirter@iohk.io>
Date: Wed, 22 Apr 2020 08:14:39 +1000
Subject: [PATCH] Bumper to 20.03

---
 hosts/cuallaidh.nix |  2 +-
 roles/matrix.nix    | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/hosts/cuallaidh.nix b/hosts/cuallaidh.nix
index 99149ac..39f3099 100644
--- a/hosts/cuallaidh.nix
+++ b/hosts/cuallaidh.nix
@@ -25,7 +25,7 @@
   networking.hostName = "cuallaidh";   # Define your hostname.
 
   nix.nixPath = [
-    "nixpkgs=https://nixos.org/channels/nixos-19.09/nixexprs.tar.xz"
+    "nixpkgs=https://nixos.org/channels/nixos-20.03/nixexprs.tar.xz"
   ];
 
   system.stateVersion = "19.03";   # The version of NixOS originally installed
diff --git a/roles/matrix.nix b/roles/matrix.nix
index 3ef9331..ccbd776 100644
--- a/roles/matrix.nix
+++ b/roles/matrix.nix
@@ -15,7 +15,6 @@
       server_name = "mcwhirter.io";                           # Server's public domain name
       public_baseurl = "https://synapse.mcwhirter.io:443/";   # Matrix target URL
       web_client = true;                                      # Whether to serve a web client
-      create_local_database = true;                           # Whether to create a local database
       enable_registration = true;                             # Toggle user registration
       listeners = [ {
         bind_address = "::1";                                 # Listen on localhost only
@@ -101,18 +100,21 @@
     };
   };
 
-  security.acme.certs = {
-    "chat.mcwhirter.io" = {
-      group = "matrix-synapse";
-      allowKeysForGroup = true;
-      postRun = "systemctl reload nginx.service";
-      email = "acme@mcwhirter.io";
-    };
-    "synapse.mcwhirter.io" = {
-      group = "matrix-synapse";
-      allowKeysForGroup = true;
-      postRun = "systemctl reload nginx.service; systemctl restart matrix-synapse.service";
-      email = "acme@mcwhirter.io";
+  security.acme = {
+    acceptTerms = true;
+    certs = {
+      "chat.mcwhirter.io" = {
+        group = "matrix-synapse";
+        allowKeysForGroup = true;
+        postRun = "systemctl reload nginx.service";
+        email = "acme@mcwhirter.io";
+      };
+      "synapse.mcwhirter.io" = {
+        group = "matrix-synapse";
+        allowKeysForGroup = true;
+        postRun = "systemctl reload nginx.service; systemctl restart matrix-synapse.service";
+        email = "acme@mcwhirter.io";
+      };
     };
   };