From 8851ec1b9d9bed393a74c5e61c7a380b375aa0c8 Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Fri, 26 Feb 2021 22:26:52 +0100
Subject: [PATCH] Update to thecodingmachine/workadventure develop branch

Also, there are now lots of new options in the workadventure module!
---
 hosts/hainich/services/workadventure.nix | 33 +++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/hosts/hainich/services/workadventure.nix b/hosts/hainich/services/workadventure.nix
index 650213a..f80e4b4 100644
--- a/hosts/hainich/services/workadventure.nix
+++ b/hosts/hainich/services/workadventure.nix
@@ -13,17 +13,17 @@ let
   # the nixos-container module is sufficiently broken that if you move these
   # fetchgits into the container config below, Nix will run into infinite recursion!
   
-  # contains the workadventure module
+  # contains the hacc assembly map
   haccpkgssrc = pkgs.fetchgit {
     url = "https://gitlab.infra4future.de/stuebinm/workadventure-nix-hacc";
     rev = "23a085b0386595f9e769ef3c182749cecc342ead";
-    sha256 = "199np37dkhk52lsjw0f9x2h9vfi86xs18gk5pfijs6pc1hr11scd";
+    sha256 = "199np37dkhk52lsjw0f9x2h9vfi800s18gk5pfijs6pc1hr11scd";
   };
-  # contains the hacc assembly map
+  # contains the workadventure module
   fediventure = pkgs.fetchgit {
     url = "https://gitlab.infra4future.de/stuebinm/fediventure-simple";
-    rev = "791fe2dce2374e1ff8b1cf4dc54bf9aac2b5c8a8";
-    sha256 = "0jzkwqvzpj6vrgrilm5ijmlbk2dvkmar3dmar5nhfply4m1za1xy";
+    rev = "2d1361f9e96e17f1a5b1de7cb75b45ed4dd1b177";
+    sha256 = "1rfyrqwlallkxgn64cd1jwa00gyig5r5xm0irfsq10jkvfsc0v5i";
   };
   haccpkgs = (import "${haccpkgssrc}/default.nix") {inherit pkgs lib;};
 
@@ -36,20 +36,23 @@ in
         imports = [ "${fediventure}/workadventure.nix" ];
         networking.firewall.allowedTCPPorts = [ 80 ];
 
-        services.workadventure.instances."workadventure" = {
+        services.workadventure."void.hacc.space" = {
           nginx = {
             default = true;
             inherit domain;
           };
-          maps.path = haccpkgs.workadventure-hacc-rc3-map.outPath + "/";
-          frontend.defaultMap = "/main.json";
-          frontend.settings = {
-            stunServer = "stun:turn.hacc.space:3478";
-            turnServer = "turn:95.217.159.23";
-            turnUser = "turn";
-            turnPassword = coturn-auth-secret;
-            jitsiUrl = "meet.ffmuc.net";
-            defaultMapUrl = "/main.json";
+          
+          frontend.startRoomUrl = "/_/global/void.hacc.space/maps/main.json";
+          
+          
+          commonConfig = {
+            webrtc.stun.url = "stun:turn.hacc.space:3478";
+            webrtc.turn = {
+              url = "turn:95.217.159.23";
+              user = "turn";
+              password = coturn-auth-secret;
+            };
+            jitsi.url = "meet.ffmuc.net";
           };
         };
       };