Merge remote-tracking branch 'lass/20.03' into 20.03

2 files changed, 5 insertions, 8 deletions

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 80ed12edc..bd113567f 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -270,14 +270,14 @@ in {
   };
 
   boot.kernel.sysctl."fs.inotify.max_user_watches" = "1048576";
-  krebs.syncthing.folders = {
+  services.syncthing.declarative.folders = {
     domsen-backups = {
       path = "/backups/domsen";
-      peers = [ "domsen-backup" ];
+      devices = [ "domsen-backup" ];
     };
     domsen-backup-srv-http = {
       path = "/srv/http";
-      peers = [ "domsen-backup" ];
+      devices = [ "domsen-backup" ];
     };
   };
 
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 901fecfb2..baeac213b 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -13,6 +13,8 @@ in {
   ];
 
   security.acme = {
+    email = "acme@lassul.us";
+    acceptTerms = true;
     certs."lassul.us" = {
       allowKeysForGroup = true;
       group = "lasscert";
@@ -72,11 +74,6 @@ in {
   security.acme.certs."cgit.lassul.us" = {
     email = "lassulus@lassul.us";
     webroot = "/var/lib/acme/acme-challenge";
-    plugins = [
-      "account_key.json"
-      "fullchain.pem"
-      "key.pem"
-    ];
     group = "nginx";
     user = "nginx";
   };